1 files changed, 28 insertions, 6 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index e4bac29a32e7..4b7cb0e691cd 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -110,7 +110,6 @@ config CRYPTO_MANAGER_DISABLE_TESTS
 
 config CRYPTO_GF128MUL
         tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
         help
           Efficient table driven implementation of multiplications in the
           field GF(2^128).  This is needed by some cypher modes. This
@@ -539,8 +538,9 @@ config CRYPTO_AES_X86_64
 
 config CRYPTO_AES_NI_INTEL
         tristate "AES cipher algorithms (AES-NI)"
-        depends on (X86 || UML_X86) && 64BIT
-        select CRYPTO_AES_X86_64
+        depends on (X86 || UML_X86)
+        select CRYPTO_AES_X86_64 if 64BIT
+        select CRYPTO_AES_586 if !64BIT
         select CRYPTO_CRYPTD
         select CRYPTO_ALGAPI
         select CRYPTO_FPU
@@ -563,9 +563,10 @@ config CRYPTO_AES_NI_INTEL
 
           See <http://csrc.nist.gov/encryption/aes/> for more information.
 
-          In addition to AES cipher algorithm support, the
-          acceleration for some popular block cipher mode is supported
-          too, including ECB, CBC, CTR, LRW, PCBC, XTS.
+          In addition to AES cipher algorithm support, the acceleration
+          for some popular block cipher mode is supported too, including
+          ECB, CBC, LRW, PCBC, XTS. The 64 bit version has additional
+          acceleration for CTR.
 
 config CRYPTO_ANUBIS
         tristate "Anubis cipher algorithm"
@@ -841,6 +842,27 @@ config CRYPTO_ANSI_CPRNG
           ANSI X9.31 A.2.4. Note that this option must be enabled if
           CRYPTO_FIPS is selected
 
+config CRYPTO_USER_API
+        tristate
+
+config CRYPTO_USER_API_HASH
+        tristate "User-space interface for hash algorithms"
+        depends on NET
+        select CRYPTO_HASH
+        select CRYPTO_USER_API
+        help
+          This option enables the user-spaces interface for hash
+          algorithms.
+
+config CRYPTO_USER_API_SKCIPHER
+        tristate "User-space interface for symmetric key cipher algorithms"
+        depends on NET
+        select CRYPTO_BLKCIPHER
+        select CRYPTO_USER_API
+        help
+          This option enables the user-spaces interface for symmetric
+          key cipher algorithms.
+
 source "drivers/crypto/Kconfig"
 
 endif   # if CRYPTO