UBUNTU: Ubuntu-2.6.38-12.51

[linux-flexiantxendom0-natty.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 9d9434f..4b7cb0e 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -23,13 +23,12 @@ comment "Crypto core or helper"
 
 config CRYPTO_FIPS
        bool "FIPS 200 compliance"
-       depends on CRYPTO_ANSI_CPRNG
+       depends on CRYPTO_ANSI_CPRNG && !CRYPTO_MANAGER_DISABLE_TESTS
        help
          This options enables the fips boot option which is
          required if you want to system to operate in a FIPS 200
          certification.  You should say no unless you know what
-         this is. Note that CRYPTO_ANSI_CPRNG is required if this
-         option is selected
+         this is.
 
 config CRYPTO_ALGAPI
        tristate
@@ -80,6 +79,11 @@ config CRYPTO_RNG2
 
 config CRYPTO_PCOMP
        tristate
+       select CRYPTO_PCOMP2
+       select CRYPTO_ALGAPI
+
+config CRYPTO_PCOMP2
+       tristate
        select CRYPTO_ALGAPI2
 
 config CRYPTO_MANAGER
@@ -94,11 +98,18 @@ config CRYPTO_MANAGER2
        select CRYPTO_AEAD2
        select CRYPTO_HASH2
        select CRYPTO_BLKCIPHER2
-       select CRYPTO_PCOMP
+       select CRYPTO_PCOMP2
+
+config CRYPTO_MANAGER_DISABLE_TESTS
+       bool "Disable run-time self tests"
+       default y
+       depends on CRYPTO_MANAGER2
+       help
+         Disable run-time self tests that normally take place at
+         algorithm registration.
 
 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
@@ -352,7 +363,7 @@ config CRYPTO_RMD128
          RIPEMD-160 should be used.
 
          Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
-         See <http://home.esat.kuleuven.be/~bosselae/ripemd160.html>
+         See <http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
 
 config CRYPTO_RMD160
        tristate "RIPEMD-160 digest algorithm"
@@ -369,7 +380,7 @@ config CRYPTO_RMD160
          against RIPEMD-160.
 
          Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
-         See <http://home.esat.kuleuven.be/~bosselae/ripemd160.html>
+         See <http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
 
 config CRYPTO_RMD256
        tristate "RIPEMD-256 digest algorithm"
@@ -381,7 +392,7 @@ config CRYPTO_RMD256
          (than RIPEMD-128).
 
          Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
-         See <http://home.esat.kuleuven.be/~bosselae/ripemd160.html>
+         See <http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
 
 config CRYPTO_RMD320
        tristate "RIPEMD-320 digest algorithm"
@@ -393,7 +404,7 @@ config CRYPTO_RMD320
          (than RIPEMD-160).
 
          Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
-         See <http://home.esat.kuleuven.be/~bosselae/ripemd160.html>
+         See <http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
 
 config CRYPTO_SHA1
        tristate "SHA1 digest algorithm"
@@ -448,7 +459,7 @@ config CRYPTO_WP512
          Whirlpool will be part of the ISO/IEC 10118-3:2003(E) standard
 
          See also:
-         <http://planeta.terra.com.br/informatica/paulobarreto/WhirlpoolPage.html>
+         <http://www.larc.usp.br/~pbarreto/WhirlpoolPage.html>
 
 config CRYPTO_GHASH_CLMUL_NI_INTEL
        tristate "GHASH digest algorithm (CLMUL-NI accelerated)"
@@ -527,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
@@ -551,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"
@@ -566,8 +579,8 @@ config CRYPTO_ANUBIS
          in the NESSIE competition.
 
          See also:
-         <https://www.cosic.esat.kuleuven.ac.be/nessie/reports/>
-         <http://planeta.terra.com.br/informatica/paulobarreto/AnubisPage.html>
+         <https://www.cosic.esat.kuleuven.be/nessie/reports/>
+         <http://www.larc.usp.br/~pbarreto/AnubisPage.html>
 
 config CRYPTO_ARC4
        tristate "ARC4 cipher algorithm"
@@ -646,7 +659,7 @@ config CRYPTO_KHAZAD
          on 32-bit processors.  Khazad uses an 128 bit key size.
 
          See also:
-         <http://planeta.terra.com.br/informatica/paulobarreto/KhazadPage.html>
+         <http://www.larc.usp.br/~pbarreto/KhazadPage.html>
 
 config CRYPTO_SALSA20
        tristate "Salsa20 stream cipher algorithm (EXPERIMENTAL)"
@@ -829,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