1 files changed, 46 insertions, 6 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index ae9c3ceb2867..e6cfe1a25137 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -105,7 +105,7 @@ config CRYPTO_USER
         depends on NET
         select CRYPTO_MANAGER
         help
-          Userapace configuration for cryptographic instantiations such as
+          Userspace configuration for cryptographic instantiations such as
           cbc(aes).
 
 config CRYPTO_MANAGER_DISABLE_TESTS
@@ -117,7 +117,7 @@ config CRYPTO_MANAGER_DISABLE_TESTS
           algorithm registration.
 
 config CRYPTO_GF128MUL
-        tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
+        tristate "GF(2^128) multiplication functions"
         help
           Efficient table driven implementation of multiplications in the
           field GF(2^128).  This is needed by some cypher modes. This
@@ -241,8 +241,7 @@ config CRYPTO_ECB
           the input block by block.
 
 config CRYPTO_LRW
-        tristate "LRW support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        tristate "LRW support"
         select CRYPTO_BLKCIPHER
         select CRYPTO_MANAGER
         select CRYPTO_GF128MUL
@@ -262,8 +261,7 @@ config CRYPTO_PCBC
           This block cipher algorithm is required for RxRPC.
 
 config CRYPTO_XTS
-        tristate "XTS support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        tristate "XTS support"
         select CRYPTO_BLKCIPHER
         select CRYPTO_MANAGER
         select CRYPTO_GF128MUL
@@ -764,6 +762,46 @@ config CRYPTO_SERPENT
           See also:
           <http://www.cl.cam.ac.uk/~rja14/serpent.html>
 
+config CRYPTO_SERPENT_SSE2_X86_64
+        tristate "Serpent cipher algorithm (x86_64/SSE2)"
+        depends on X86 && 64BIT
+        select CRYPTO_ALGAPI
+        select CRYPTO_CRYPTD
+        select CRYPTO_SERPENT
+        select CRYPTO_LRW
+        select CRYPTO_XTS
+        help
+          Serpent cipher algorithm, by Anderson, Biham & Knudsen.
+
+          Keys are allowed to be from 0 to 256 bits in length, in steps
+          of 8 bits.
+
+          This module provides Serpent cipher algorithm that processes eigth
+          blocks parallel using SSE2 instruction set.
+
+          See also:
+          <http://www.cl.cam.ac.uk/~rja14/serpent.html>
+
+config CRYPTO_SERPENT_SSE2_586
+        tristate "Serpent cipher algorithm (i586/SSE2)"
+        depends on X86 && !64BIT
+        select CRYPTO_ALGAPI
+        select CRYPTO_CRYPTD
+        select CRYPTO_SERPENT
+        select CRYPTO_LRW
+        select CRYPTO_XTS
+        help
+          Serpent cipher algorithm, by Anderson, Biham & Knudsen.
+
+          Keys are allowed to be from 0 to 256 bits in length, in steps
+          of 8 bits.
+
+          This module provides Serpent cipher algorithm that processes four
+          blocks parallel using SSE2 instruction set.
+
+          See also:
+          <http://www.cl.cam.ac.uk/~rja14/serpent.html>
+
 config CRYPTO_TEA
         tristate "TEA, XTEA and XETA cipher algorithms"
         select CRYPTO_ALGAPI
@@ -840,6 +878,8 @@ config CRYPTO_TWOFISH_X86_64_3WAY
         select CRYPTO_ALGAPI
         select CRYPTO_TWOFISH_COMMON
         select CRYPTO_TWOFISH_X86_64
+        select CRYPTO_LRW
+        select CRYPTO_XTS
         help
           Twofish cipher algorithm (x86_64, 3-way parallel).