1 files changed, 21 insertions, 2 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 26b5dd0cb564..403857ad06d4 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -114,6 +114,16 @@ config CRYPTO_NULL
         help
           These are 'Null' algorithms, used by IPsec, which do nothing.
 
+config CRYPTO_PCRYPT
+        tristate "Parallel crypto engine (EXPERIMENTAL)"
+        depends on SMP && EXPERIMENTAL
+        select PADATA
+        select CRYPTO_MANAGER
+        select CRYPTO_AEAD
+        help
+          This converts an arbitrary crypto algorithm into a parallel
+          algorithm that executes in kernel threads.
+
 config CRYPTO_WORKQUEUE
        tristate
 
@@ -440,6 +450,15 @@ config CRYPTO_WP512
           See also:
           <http://planeta.terra.com.br/informatica/paulobarreto/WhirlpoolPage.html>
 
+config CRYPTO_GHASH_CLMUL_NI_INTEL
+        tristate "GHASH digest algorithm (CLMUL-NI accelerated)"
+        depends on (X86 || UML_X86) && 64BIT
+        select CRYPTO_SHASH
+        select CRYPTO_CRYPTD
+        help
+          GHASH is message digest algorithm for GCM (Galois/Counter Mode).
+          The implementation is accelerated by CLMUL-NI of Intel.
+
 comment "Ciphers"
 
 config CRYPTO_AES
@@ -807,8 +826,8 @@ config CRYPTO_ANSI_CPRNG
         help
           This option enables the generic pseudo random number generator
           for cryptographic modules.  Uses the Algorithm specified in
-          ANSI X9.31 A.2.4. Not this option must be enabled if CRYPTO_FIPS 
-          is selected
+          ANSI X9.31 A.2.4. Note that this option must be enabled if
+          CRYPTO_FIPS is selected
 
 source "drivers/crypto/Kconfig"