diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-11 22:58:31 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-11 22:58:31 -0800 |
| commit | 1adf65d55699d040b1d693470aa9a116202d32ed (patch) | |
| tree | 2299c793e1c8ada26a6aaa7d11e596fe96fa8096 /crypto | |
| parent | 1c11ed58397f048d8187222927092b397a149d70 (diff) | |
| parent | 04a2abffe684b5f7308cfc4f9a6aee01d1d2b1dc (diff) | |
| download | linux-crypto-1adf65d55699d040b1d693470aa9a116202d32ed.tar.gz linux-crypto-1adf65d55699d040b1d693470aa9a116202d32ed.zip | |
Merge tag 'for-gregkh-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into driver-core-next
Kees writes:
The current Acked set of patches for dropping CONFIG_EXPERIMENTAL.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Kconfig | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 4641d956..3f375200 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -134,8 +134,8 @@ config CRYPTO_NULL These are 'Null' algorithms, used by IPsec, which do nothing. config CRYPTO_PCRYPT - tristate "Parallel crypto engine (EXPERIMENTAL)" - depends on SMP && EXPERIMENTAL + tristate "Parallel crypto engine" + depends on SMP select PADATA select CRYPTO_MANAGER select CRYPTO_AEAD @@ -292,7 +292,6 @@ config CRYPTO_HMAC config CRYPTO_XCBC tristate "XCBC support" - depends on EXPERIMENTAL select CRYPTO_HASH select CRYPTO_MANAGER help @@ -303,7 +302,6 @@ config CRYPTO_XCBC config CRYPTO_VMAC tristate "VMAC support" - depends on EXPERIMENTAL select CRYPTO_HASH select CRYPTO_MANAGER help @@ -932,8 +930,7 @@ config CRYPTO_KHAZAD <http://www.larc.usp.br/~pbarreto/KhazadPage.html> config CRYPTO_SALSA20 - tristate "Salsa20 stream cipher algorithm (EXPERIMENTAL)" - depends on EXPERIMENTAL + tristate "Salsa20 stream cipher algorithm" select CRYPTO_BLKCIPHER help Salsa20 stream cipher algorithm. @@ -945,9 +942,8 @@ config CRYPTO_SALSA20 Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html> config CRYPTO_SALSA20_586 - tristate "Salsa20 stream cipher algorithm (i586) (EXPERIMENTAL)" + tristate "Salsa20 stream cipher algorithm (i586)" depends on (X86 || UML_X86) && !64BIT - depends on EXPERIMENTAL select CRYPTO_BLKCIPHER help Salsa20 stream cipher algorithm. @@ -959,9 +955,8 @@ config CRYPTO_SALSA20_586 Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html> config CRYPTO_SALSA20_X86_64 - tristate "Salsa20 stream cipher algorithm (x86_64) (EXPERIMENTAL)" + tristate "Salsa20 stream cipher algorithm (x86_64)" depends on (X86 || UML_X86) && 64BIT - depends on EXPERIMENTAL select CRYPTO_BLKCIPHER help Salsa20 stream cipher algorithm. |