aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/Kconfig')
-rw-r--r--crypto/Kconfig15
1 files changed, 5 insertions, 10 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 4641d95651d3..3f37520035dd 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -134,8 +134,8 @@ config CRYPTO_NULL
134 These are 'Null' algorithms, used by IPsec, which do nothing. 134 These are 'Null' algorithms, used by IPsec, which do nothing.
135 135
136config CRYPTO_PCRYPT 136config CRYPTO_PCRYPT
137 tristate "Parallel crypto engine (EXPERIMENTAL)" 137 tristate "Parallel crypto engine"
138 depends on SMP && EXPERIMENTAL 138 depends on SMP
139 select PADATA 139 select PADATA
140 select CRYPTO_MANAGER 140 select CRYPTO_MANAGER
141 select CRYPTO_AEAD 141 select CRYPTO_AEAD
@@ -292,7 +292,6 @@ config CRYPTO_HMAC
292 292
293config CRYPTO_XCBC 293config CRYPTO_XCBC
294 tristate "XCBC support" 294 tristate "XCBC support"
295 depends on EXPERIMENTAL
296 select CRYPTO_HASH 295 select CRYPTO_HASH
297 select CRYPTO_MANAGER 296 select CRYPTO_MANAGER
298 help 297 help
@@ -303,7 +302,6 @@ config CRYPTO_XCBC
303 302
304config CRYPTO_VMAC 303config CRYPTO_VMAC
305 tristate "VMAC support" 304 tristate "VMAC support"
306 depends on EXPERIMENTAL
307 select CRYPTO_HASH 305 select CRYPTO_HASH
308 select CRYPTO_MANAGER 306 select CRYPTO_MANAGER
309 help 307 help
@@ -932,8 +930,7 @@ config CRYPTO_KHAZAD
932 <http://www.larc.usp.br/~pbarreto/KhazadPage.html> 930 <http://www.larc.usp.br/~pbarreto/KhazadPage.html>
933 931
934config CRYPTO_SALSA20 932config CRYPTO_SALSA20
935 tristate "Salsa20 stream cipher algorithm (EXPERIMENTAL)" 933 tristate "Salsa20 stream cipher algorithm"
936 depends on EXPERIMENTAL
937 select CRYPTO_BLKCIPHER 934 select CRYPTO_BLKCIPHER
938 help 935 help
939 Salsa20 stream cipher algorithm. 936 Salsa20 stream cipher algorithm.
@@ -945,9 +942,8 @@ config CRYPTO_SALSA20
945 Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html> 942 Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>
946 943
947config CRYPTO_SALSA20_586 944config CRYPTO_SALSA20_586
948 tristate "Salsa20 stream cipher algorithm (i586) (EXPERIMENTAL)" 945 tristate "Salsa20 stream cipher algorithm (i586)"
949 depends on (X86 || UML_X86) && !64BIT 946 depends on (X86 || UML_X86) && !64BIT
950 depends on EXPERIMENTAL
951 select CRYPTO_BLKCIPHER 947 select CRYPTO_BLKCIPHER
952 help 948 help
953 Salsa20 stream cipher algorithm. 949 Salsa20 stream cipher algorithm.
@@ -959,9 +955,8 @@ config CRYPTO_SALSA20_586
959 Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html> 955 Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>
960 956
961config CRYPTO_SALSA20_X86_64 957config CRYPTO_SALSA20_X86_64
962 tristate "Salsa20 stream cipher algorithm (x86_64) (EXPERIMENTAL)" 958 tristate "Salsa20 stream cipher algorithm (x86_64)"
963 depends on (X86 || UML_X86) && 64BIT 959 depends on (X86 || UML_X86) && 64BIT
964 depends on EXPERIMENTAL
965 select CRYPTO_BLKCIPHER 960 select CRYPTO_BLKCIPHER
966 help 961 help
967 Salsa20 stream cipher algorithm. 962 Salsa20 stream cipher algorithm.