crypto: fips - Depend on ansi_cprng

[safe/jmp/linux-2.6] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 981497c..7623442 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -13,134 +13,194 @@ source "crypto/async_tx/Kconfig"
 # Cryptographic API Configuration
 #
 menuconfig CRYPTO
 # Cryptographic API Configuration
 #
 menuconfig CRYPTO

-       bool "Cryptographic API"
+       tristate "Cryptographic API"

        help
          This option provides the core Cryptographic API.
 
 if CRYPTO
 
        help
          This option provides the core Cryptographic API.
 
 if CRYPTO
 

+comment "Crypto core or helper"
+
+config CRYPTO_FIPS
+       bool "FIPS 200 compliance"
+       depends on CRYPTO_ANSI_CPRNG
+       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 requred if this
+         option is selected
+

 config CRYPTO_ALGAPI
        tristate
 config CRYPTO_ALGAPI
        tristate

+       select CRYPTO_ALGAPI2

        help
          This option provides the API for cryptographic algorithms.
 
        help
          This option provides the API for cryptographic algorithms.
 

-config CRYPTO_ABLKCIPHER
+config CRYPTO_ALGAPI2

        tristate
        tristate

-       select CRYPTO_BLKCIPHER
+
+config CRYPTO_AEAD
+       tristate
+       select CRYPTO_AEAD2
+       select CRYPTO_ALGAPI
+
+config CRYPTO_AEAD2
+       tristate
+       select CRYPTO_ALGAPI2

 
 config CRYPTO_BLKCIPHER
        tristate
 
 config CRYPTO_BLKCIPHER
        tristate

+       select CRYPTO_BLKCIPHER2

        select CRYPTO_ALGAPI
 
        select CRYPTO_ALGAPI
 

+config CRYPTO_BLKCIPHER2
+       tristate
+       select CRYPTO_ALGAPI2
+       select CRYPTO_RNG2
+       select CRYPTO_WORKQUEUE
+

 config CRYPTO_HASH
        tristate
 config CRYPTO_HASH
        tristate

+       select CRYPTO_HASH2

        select CRYPTO_ALGAPI
 
        select CRYPTO_ALGAPI
 

+config CRYPTO_HASH2
+       tristate
+       select CRYPTO_ALGAPI2
+
+config CRYPTO_RNG
+       tristate
+       select CRYPTO_RNG2
+       select CRYPTO_ALGAPI
+
+config CRYPTO_RNG2
+       tristate
+       select CRYPTO_ALGAPI2
+
+config CRYPTO_PCOMP
+       tristate
+       select CRYPTO_ALGAPI2
+

 config CRYPTO_MANAGER
        tristate "Cryptographic algorithm manager"
 config CRYPTO_MANAGER
        tristate "Cryptographic algorithm manager"

-       select CRYPTO_ALGAPI
+       select CRYPTO_MANAGER2

        help
          Create default cryptographic template instantiations such as
          cbc(aes).
 
        help
          Create default cryptographic template instantiations such as
          cbc(aes).
 

-config CRYPTO_HMAC
-       tristate "HMAC support"
-       select CRYPTO_HASH
-       select CRYPTO_MANAGER
-       help
-         HMAC: Keyed-Hashing for Message Authentication (RFC2104).
-         This is required for IPSec.
+config CRYPTO_MANAGER2
+       def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
+       select CRYPTO_AEAD2
+       select CRYPTO_HASH2
+       select CRYPTO_BLKCIPHER2
+       select CRYPTO_PCOMP

 
 

-config CRYPTO_XCBC
-       tristate "XCBC support"
+config CRYPTO_GF128MUL
+       tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"

        depends on EXPERIMENTAL
        depends on EXPERIMENTAL

-       select CRYPTO_HASH
-       select CRYPTO_MANAGER

        help
        help

-         XCBC: Keyed-Hashing with encryption algorithm
-               http://www.ietf.org/rfc/rfc3566.txt
-               http://csrc.nist.gov/encryption/modes/proposedmodes/
-                xcbc-mac/xcbc-mac-spec.pdf
+         Efficient table driven implementation of multiplications in the
+         field GF(2^128).  This is needed by some cypher modes. This
+         option will be selected automatically if you select such a
+         cipher mode.  Only select this option by hand if you expect to load
+         an external module that requires these functions.

 
 config CRYPTO_NULL
        tristate "Null algorithms"
        select CRYPTO_ALGAPI
 
 config CRYPTO_NULL
        tristate "Null algorithms"
        select CRYPTO_ALGAPI

+       select CRYPTO_BLKCIPHER
+       select CRYPTO_HASH

        help
          These are 'Null' algorithms, used by IPsec, which do nothing.
 
        help
          These are 'Null' algorithms, used by IPsec, which do nothing.
 

-config CRYPTO_MD4
-       tristate "MD4 digest algorithm"
-       select CRYPTO_ALGAPI
-       help
-         MD4 message digest algorithm (RFC1320).
+config CRYPTO_WORKQUEUE
+       tristate

 
 

-config CRYPTO_MD5
-       tristate "MD5 digest algorithm"
-       select CRYPTO_ALGAPI
+config CRYPTO_CRYPTD
+       tristate "Software async crypto daemon"
+       select CRYPTO_BLKCIPHER
+       select CRYPTO_HASH
+       select CRYPTO_MANAGER
+       select CRYPTO_WORKQUEUE

        help
        help

-         MD5 message digest algorithm (RFC1321).
+         This is a generic software asynchronous crypto daemon that
+         converts an arbitrary synchronous software crypto algorithm
+         into an asynchronous algorithm that executes in a kernel thread.

 
 

-config CRYPTO_SHA1
-       tristate "SHA1 digest algorithm"
-       select CRYPTO_ALGAPI
+config CRYPTO_AUTHENC
+       tristate "Authenc support"
+       select CRYPTO_AEAD
+       select CRYPTO_BLKCIPHER
+       select CRYPTO_MANAGER
+       select CRYPTO_HASH

        help
        help

-         SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
+         Authenc: Combined mode wrapper for IPsec.
+         This is required for IPSec.

 
 

-config CRYPTO_SHA256
-       tristate "SHA256 digest algorithm"
-       select CRYPTO_ALGAPI
+config CRYPTO_TEST
+       tristate "Testing module"
+       depends on m
+       select CRYPTO_MANAGER

        help
        help

-         SHA256 secure hash standard (DFIPS 180-2).
-         
-         This version of SHA implements a 256 bit hash with 128 bits of
-         security against collision attacks.
+         Quick & dirty crypto test module.

 
 

-config CRYPTO_SHA512
-       tristate "SHA384 and SHA512 digest algorithms"
-       select CRYPTO_ALGAPI
-       help
-         SHA512 secure hash standard (DFIPS 180-2).
-         
-         This version of SHA implements a 512 bit hash with 256 bits of
-         security against collision attacks.
+comment "Authenticated Encryption with Associated Data"

 
 

-         This code also includes SHA-384, a 384 bit hash with 192 bits
-         of security against collision attacks.
+config CRYPTO_CCM
+       tristate "CCM support"
+       select CRYPTO_CTR
+       select CRYPTO_AEAD
+       help
+         Support for Counter with CBC MAC. Required for IPsec.

 
 

-config CRYPTO_WP512
-       tristate "Whirlpool digest algorithms"
-       select CRYPTO_ALGAPI
+config CRYPTO_GCM
+       tristate "GCM/GMAC support"
+       select CRYPTO_CTR
+       select CRYPTO_AEAD
+       select CRYPTO_GHASH

        help
        help

-         Whirlpool hash algorithm 512, 384 and 256-bit hashes
+         Support for Galois/Counter Mode (GCM) and Galois Message
+         Authentication Code (GMAC). Required for IPSec.

 
 

-         Whirlpool-512 is part of the NESSIE cryptographic primitives.
-         Whirlpool will be part of the ISO/IEC 10118-3:2003(E) standard
+config CRYPTO_SEQIV
+       tristate "Sequence Number IV Generator"
+       select CRYPTO_AEAD
+       select CRYPTO_BLKCIPHER
+       select CRYPTO_RNG
+       help
+         This IV generator generates an IV based on a sequence number by
+         xoring it with a salt.  This algorithm is mainly useful for CTR

 
 

-         See also:
-         <http://planeta.terra.com.br/informatica/paulobarreto/WhirlpoolPage.html>
+comment "Block modes"

 
 

-config CRYPTO_TGR192
-       tristate "Tiger digest algorithms"
-       select CRYPTO_ALGAPI
+config CRYPTO_CBC
+       tristate "CBC support"
+       select CRYPTO_BLKCIPHER
+       select CRYPTO_MANAGER

        help
        help

-         Tiger hash algorithm 192, 160 and 128-bit hashes
-
-         Tiger is a hash function optimized for 64-bit processors while
-         still having decent performance on 32-bit processors.
-         Tiger was developed by Ross Anderson and Eli Biham.
+         CBC: Cipher Block Chaining mode
+         This block cipher algorithm is required for IPSec.

 
 

-         See also:
-         <http://www.cs.technion.ac.il/~biham/Reports/Tiger/>.
+config CRYPTO_CTR
+       tristate "CTR support"
+       select CRYPTO_BLKCIPHER
+       select CRYPTO_SEQIV
+       select CRYPTO_MANAGER
+       help
+         CTR: Counter mode
+         This block cipher algorithm is required for IPSec.

 
 

-config CRYPTO_GF128MUL
-       tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+config CRYPTO_CTS
+       tristate "CTS support"
+       select CRYPTO_BLKCIPHER

        help
        help

-         Efficient table driven implementation of multiplications in the
-         field GF(2^128).  This is needed by some cypher modes. This
-         option will be selected automatically if you select such a
-         cipher mode.  Only select this option by hand if you expect to load
-         an external module that requires these functions.
+         CTS: Cipher Text Stealing
+         This is the Cipher Text Stealing mode as described by
+         Section 8 of rfc2040 and referenced by rfc3962.
+         (rfc3962 includes errata information in its Appendix A)
+         This mode is required for Kerberos gss mechanism support
+         for AES encryption.

 
 config CRYPTO_ECB
        tristate "ECB support"
 
 config CRYPTO_ECB
        tristate "ECB support"


@@ -151,13 +211,18 @@ config CRYPTO_ECB
          This is the simplest block cipher algorithm.  It simply encrypts
          the input block by block.
 
          This is the simplest block cipher algorithm.  It simply encrypts
          the input block by block.
 

-config CRYPTO_CBC
-       tristate "CBC support"
+config CRYPTO_LRW
+       tristate "LRW support (EXPERIMENTAL)"
+       depends on EXPERIMENTAL

        select CRYPTO_BLKCIPHER
        select CRYPTO_MANAGER
        select CRYPTO_BLKCIPHER
        select CRYPTO_MANAGER

+       select CRYPTO_GF128MUL

        help
        help

-         CBC: Cipher Block Chaining mode
-         This block cipher algorithm is required for IPSec.
+         LRW: Liskov Rivest Wagner, a tweakable, non malleable, non movable
+         narrow block cipher mode for dm-crypt.  Use it with cipher
+         specification string aes-lrw-benbi, the key must be 256, 320 or 384.
+         The first 128, 192 or 256 bits in the key are used for AES and the
+         rest is used to tie each cipher block to its logical position.

 
 config CRYPTO_PCBC
        tristate "PCBC support"
 
 config CRYPTO_PCBC
        tristate "PCBC support"


@@ -167,137 +232,221 @@ config CRYPTO_PCBC
          PCBC: Propagating Cipher Block Chaining mode
          This block cipher algorithm is required for RxRPC.
 
          PCBC: Propagating Cipher Block Chaining mode
          This block cipher algorithm is required for RxRPC.
 

-config CRYPTO_LRW
-       tristate "LRW support (EXPERIMENTAL)"
+config CRYPTO_XTS
+       tristate "XTS support (EXPERIMENTAL)"

        depends on EXPERIMENTAL
        select CRYPTO_BLKCIPHER
        select CRYPTO_MANAGER
        select CRYPTO_GF128MUL
        help
        depends on EXPERIMENTAL
        select CRYPTO_BLKCIPHER
        select CRYPTO_MANAGER
        select CRYPTO_GF128MUL
        help

-         LRW: Liskov Rivest Wagner, a tweakable, non malleable, non movable
-         narrow block cipher mode for dm-crypt.  Use it with cipher
-         specification string aes-lrw-benbi, the key must be 256, 320 or 384.
-         The first 128, 192 or 256 bits in the key are used for AES and the
-         rest is used to tie each cipher block to its logical position.
+         XTS: IEEE1619/D16 narrow block cipher use with aes-xts-plain,
+         key size 256, 384 or 512 bits. This implementation currently
+         can't handle a sectorsize which is not a multiple of 16 bytes.

 
 

-config CRYPTO_CRYPTD
-       tristate "Software async crypto daemon"
-       select CRYPTO_ABLKCIPHER
+config CRYPTO_FPU
+       tristate
+       select CRYPTO_BLKCIPHER
+       select CRYPTO_MANAGER
+
+comment "Hash modes"
+
+config CRYPTO_HMAC
+       tristate "HMAC support"
+       select CRYPTO_HASH

        select CRYPTO_MANAGER
        help
        select CRYPTO_MANAGER
        help

-         This is a generic software asynchronous crypto daemon that
-         converts an arbitrary synchronous software crypto algorithm
-         into an asynchronous algorithm that executes in a kernel thread.
+         HMAC: Keyed-Hashing for Message Authentication (RFC2104).
+         This is required for IPSec.

 
 

-config CRYPTO_DES
-       tristate "DES and Triple DES EDE cipher algorithms"
-       select CRYPTO_ALGAPI
+config CRYPTO_XCBC
+       tristate "XCBC support"
+       depends on EXPERIMENTAL
+       select CRYPTO_HASH
+       select CRYPTO_MANAGER

        help
        help

-         DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
+         XCBC: Keyed-Hashing with encryption algorithm
+               http://www.ietf.org/rfc/rfc3566.txt
+               http://csrc.nist.gov/encryption/modes/proposedmodes/
+                xcbc-mac/xcbc-mac-spec.pdf

 
 

-config CRYPTO_FCRYPT
-       tristate "FCrypt cipher algorithm"
-       select CRYPTO_ALGAPI
-       select CRYPTO_BLKCIPHER
+comment "Digest"
+
+config CRYPTO_CRC32C
+       tristate "CRC32c CRC algorithm"
+       select CRYPTO_HASH

        help
        help

-         FCrypt algorithm used by RxRPC.
+         Castagnoli, et al Cyclic Redundancy-Check Algorithm.  Used
+         by iSCSI for header and data digests and by others.
+         See Castagnoli93.  Module will be crc32c.

 
 

-config CRYPTO_BLOWFISH
-       tristate "Blowfish cipher algorithm"
-       select CRYPTO_ALGAPI
+config CRYPTO_CRC32C_INTEL
+       tristate "CRC32c INTEL hardware acceleration"
+       depends on X86
+       select CRYPTO_HASH

        help
        help

-         Blowfish cipher algorithm, by Bruce Schneier.
-         
-         This is a variable key length cipher which can use keys from 32
-         bits to 448 bits in length.  It's fast, simple and specifically
-         designed for use on "large microprocessors".
-         
-         See also:
-         <http://www.schneier.com/blowfish.html>
+         In Intel processor with SSE4.2 supported, the processor will
+         support CRC32C implementation using hardware accelerated CRC32
+         instruction. This option will create 'crc32c-intel' module,
+         which will enable any routine to use the CRC32 instruction to
+         gain performance compared with software implementation.
+         Module will be crc32c-intel.

 
 

-config CRYPTO_TWOFISH
-       tristate "Twofish cipher algorithm"
-       select CRYPTO_ALGAPI
-       select CRYPTO_TWOFISH_COMMON
+config CRYPTO_GHASH
+       tristate "GHASH digest algorithm"
+       select CRYPTO_SHASH
+       select CRYPTO_GF128MUL

        help
        help

-         Twofish cipher algorithm.
-         
-         Twofish was submitted as an AES (Advanced Encryption Standard)
-         candidate cipher by researchers at CounterPane Systems.  It is a
-         16 round block cipher supporting key sizes of 128, 192, and 256
-         bits.
-         
-         See also:
-         <http://www.schneier.com/twofish.html>
+         GHASH is message digest algorithm for GCM (Galois/Counter Mode).

 
 

-config CRYPTO_TWOFISH_COMMON
-       tristate
+config CRYPTO_MD4
+       tristate "MD4 digest algorithm"
+       select CRYPTO_HASH

        help
        help

-         Common parts of the Twofish cipher algorithm shared by the
-         generic c and the assembler implementations.
+         MD4 message digest algorithm (RFC1320).

 
 

-config CRYPTO_TWOFISH_586
-       tristate "Twofish cipher algorithms (i586)"
-       depends on (X86 || UML_X86) && !64BIT
-       select CRYPTO_ALGAPI
-       select CRYPTO_TWOFISH_COMMON
+config CRYPTO_MD5
+       tristate "MD5 digest algorithm"
+       select CRYPTO_HASH

        help
        help

-         Twofish cipher algorithm.
+         MD5 message digest algorithm (RFC1321).

 
 

-         Twofish was submitted as an AES (Advanced Encryption Standard)
-         candidate cipher by researchers at CounterPane Systems.  It is a
-         16 round block cipher supporting key sizes of 128, 192, and 256
-         bits.
+config CRYPTO_MICHAEL_MIC
+       tristate "Michael MIC keyed digest algorithm"
+       select CRYPTO_HASH
+       help
+         Michael MIC is used for message integrity protection in TKIP
+         (IEEE 802.11i). This algorithm is required for TKIP, but it
+         should not be used for other purposes because of the weakness
+         of the algorithm.

 
 

-         See also:
-         <http://www.schneier.com/twofish.html>
+config CRYPTO_RMD128
+       tristate "RIPEMD-128 digest algorithm"
+       select CRYPTO_HASH
+       help
+         RIPEMD-128 (ISO/IEC 10118-3:2004).

 
 

-config CRYPTO_TWOFISH_X86_64
-       tristate "Twofish cipher algorithm (x86_64)"
-       depends on (X86 || UML_X86) && 64BIT
-       select CRYPTO_ALGAPI
-       select CRYPTO_TWOFISH_COMMON
+         RIPEMD-128 is a 128-bit cryptographic hash function. It should only
+         to be used as a secure replacement for RIPEMD. For other use cases
+         RIPEMD-160 should be used.
+
+         Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
+         See <http://home.esat.kuleuven.be/~bosselae/ripemd160.html>
+
+config CRYPTO_RMD160
+       tristate "RIPEMD-160 digest algorithm"
+       select CRYPTO_HASH

        help
        help

-         Twofish cipher algorithm (x86_64).
+         RIPEMD-160 (ISO/IEC 10118-3:2004).
+
+         RIPEMD-160 is a 160-bit cryptographic hash function. It is intended
+         to be used as a secure replacement for the 128-bit hash functions
+         MD4, MD5 and it's predecessor RIPEMD
+         (not to be confused with RIPEMD-128).
+
+         It's speed is comparable to SHA1 and there are no known attacks
+         against RIPEMD-160.
+
+         Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
+         See <http://home.esat.kuleuven.be/~bosselae/ripemd160.html>
+
+config CRYPTO_RMD256
+       tristate "RIPEMD-256 digest algorithm"
+       select CRYPTO_HASH
+       help
+         RIPEMD-256 is an optional extension of RIPEMD-128 with a
+         256 bit hash. It is intended for applications that require
+         longer hash-results, without needing a larger security level
+         (than RIPEMD-128).
+
+         Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
+         See <http://home.esat.kuleuven.be/~bosselae/ripemd160.html>
+
+config CRYPTO_RMD320
+       tristate "RIPEMD-320 digest algorithm"
+       select CRYPTO_HASH
+       help
+         RIPEMD-320 is an optional extension of RIPEMD-160 with a
+         320 bit hash. It is intended for applications that require
+         longer hash-results, without needing a larger security level
+         (than RIPEMD-160).
+
+         Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
+         See <http://home.esat.kuleuven.be/~bosselae/ripemd160.html>
+
+config CRYPTO_SHA1
+       tristate "SHA1 digest algorithm"
+       select CRYPTO_HASH
+       help
+         SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
+
+config CRYPTO_SHA256
+       tristate "SHA224 and SHA256 digest algorithm"
+       select CRYPTO_HASH
+       help
+         SHA256 secure hash standard (DFIPS 180-2).
+
+         This version of SHA implements a 256 bit hash with 128 bits of
+         security against collision attacks.
+
+         This code also includes SHA-224, a 224 bit hash with 112 bits
+         of security against collision attacks.
+
+config CRYPTO_SHA512
+       tristate "SHA384 and SHA512 digest algorithms"
+       select CRYPTO_HASH
+       help
+         SHA512 secure hash standard (DFIPS 180-2).
+
+         This version of SHA implements a 512 bit hash with 256 bits of
+         security against collision attacks.
+
+         This code also includes SHA-384, a 384 bit hash with 192 bits
+         of security against collision attacks.
+
+config CRYPTO_TGR192
+       tristate "Tiger digest algorithms"
+       select CRYPTO_HASH
+       help
+         Tiger hash algorithm 192, 160 and 128-bit hashes

 
 

-         Twofish was submitted as an AES (Advanced Encryption Standard)
-         candidate cipher by researchers at CounterPane Systems.  It is a
-         16 round block cipher supporting key sizes of 128, 192, and 256
-         bits.
+         Tiger is a hash function optimized for 64-bit processors while
+         still having decent performance on 32-bit processors.
+         Tiger was developed by Ross Anderson and Eli Biham.

 
          See also:
 
          See also:

-         <http://www.schneier.com/twofish.html>
+         <http://www.cs.technion.ac.il/~biham/Reports/Tiger/>.

 
 

-config CRYPTO_SERPENT
-       tristate "Serpent cipher algorithm"
-       select CRYPTO_ALGAPI
+config CRYPTO_WP512
+       tristate "Whirlpool digest algorithms"
+       select CRYPTO_HASH

        help
        help

-         Serpent cipher algorithm, by Anderson, Biham & Knudsen.
+         Whirlpool hash algorithm 512, 384 and 256-bit hashes

 
 

-         Keys are allowed to be from 0 to 256 bits in length, in steps
-         of 8 bits.  Also includes the 'Tnepres' algorithm, a reversed
-         variant of Serpent for compatibility with old kerneli.org code.
+         Whirlpool-512 is part of the NESSIE cryptographic primitives.
+         Whirlpool will be part of the ISO/IEC 10118-3:2003(E) standard

 
          See also:
 
          See also:

-         <http://www.cl.cam.ac.uk/~rja14/serpent.html>
+         <http://planeta.terra.com.br/informatica/paulobarreto/WhirlpoolPage.html>
+
+comment "Ciphers"

 
 config CRYPTO_AES
        tristate "AES cipher algorithms"
        select CRYPTO_ALGAPI
        help
 
 config CRYPTO_AES
        tristate "AES cipher algorithms"
        select CRYPTO_ALGAPI
        help

-         AES cipher algorithms (FIPS-197). AES uses the Rijndael 
+         AES cipher algorithms (FIPS-197). AES uses the Rijndael

          algorithm.
 
          Rijndael appears to be consistently a very good performer in
          algorithm.
 
          Rijndael appears to be consistently a very good performer in

-         both hardware and software across a wide range of computing 
-         environments regardless of its use in feedback or non-feedback 
-         modes. Its key setup time is excellent, and its key agility is 
-         good. Rijndael's very low memory requirements make it very well 
-         suited for restricted-space environments, in which it also 
-         demonstrates excellent performance. Rijndael's operations are 
-         among the easiest to defend against power and timing attacks. 
+         both hardware and software across a wide range of computing
+         environments regardless of its use in feedback or non-feedback
+         modes. Its key setup time is excellent, and its key agility is
+         good. Rijndael's very low memory requirements make it very well
+         suited for restricted-space environments, in which it also
+         demonstrates excellent performance. Rijndael's operations are
+         among the easiest to defend against power and timing attacks.

 
 

-         The AES specifies three key sizes: 128, 192 and 256 bits        
+         The AES specifies three key sizes: 128, 192 and 256 bits

 
          See <http://csrc.nist.gov/CryptoToolkit/aes/> for more information.
 
 
          See <http://csrc.nist.gov/CryptoToolkit/aes/> for more information.
 


@@ -305,20 +454,21 @@ config CRYPTO_AES_586
        tristate "AES cipher algorithms (i586)"
        depends on (X86 || UML_X86) && !64BIT
        select CRYPTO_ALGAPI
        tristate "AES cipher algorithms (i586)"
        depends on (X86 || UML_X86) && !64BIT
        select CRYPTO_ALGAPI

+       select CRYPTO_AES

        help
        help

-         AES cipher algorithms (FIPS-197). AES uses the Rijndael 
+         AES cipher algorithms (FIPS-197). AES uses the Rijndael

          algorithm.
 
          Rijndael appears to be consistently a very good performer in
          algorithm.
 
          Rijndael appears to be consistently a very good performer in

-         both hardware and software across a wide range of computing 
-         environments regardless of its use in feedback or non-feedback 
-         modes. Its key setup time is excellent, and its key agility is 
-         good. Rijndael's very low memory requirements make it very well 
-         suited for restricted-space environments, in which it also 
-         demonstrates excellent performance. Rijndael's operations are 
-         among the easiest to defend against power and timing attacks. 
+         both hardware and software across a wide range of computing
+         environments regardless of its use in feedback or non-feedback
+         modes. Its key setup time is excellent, and its key agility is
+         good. Rijndael's very low memory requirements make it very well
+         suited for restricted-space environments, in which it also
+         demonstrates excellent performance. Rijndael's operations are
+         among the easiest to defend against power and timing attacks.

 
 

-         The AES specifies three key sizes: 128, 192 and 256 bits        
+         The AES specifies three key sizes: 128, 192 and 256 bits

 
          See <http://csrc.nist.gov/encryption/aes/> for more information.
 
 
          See <http://csrc.nist.gov/encryption/aes/> for more information.
 


@@ -326,23 +476,107 @@ config CRYPTO_AES_X86_64
        tristate "AES cipher algorithms (x86_64)"
        depends on (X86 || UML_X86) && 64BIT
        select CRYPTO_ALGAPI
        tristate "AES cipher algorithms (x86_64)"
        depends on (X86 || UML_X86) && 64BIT
        select CRYPTO_ALGAPI

+       select CRYPTO_AES
+       help
+         AES cipher algorithms (FIPS-197). AES uses the Rijndael
+         algorithm.
+
+         Rijndael appears to be consistently a very good performer in
+         both hardware and software across a wide range of computing
+         environments regardless of its use in feedback or non-feedback
+         modes. Its key setup time is excellent, and its key agility is
+         good. Rijndael's very low memory requirements make it very well
+         suited for restricted-space environments, in which it also
+         demonstrates excellent performance. Rijndael's operations are
+         among the easiest to defend against power and timing attacks.
+
+         The AES specifies three key sizes: 128, 192 and 256 bits
+
+         See <http://csrc.nist.gov/encryption/aes/> for more information.
+
+config CRYPTO_AES_NI_INTEL
+       tristate "AES cipher algorithms (AES-NI)"
+       depends on (X86 || UML_X86) && 64BIT
+       select CRYPTO_AES_X86_64
+       select CRYPTO_CRYPTD
+       select CRYPTO_ALGAPI
+       select CRYPTO_FPU

        help
        help

-         AES cipher algorithms (FIPS-197). AES uses the Rijndael 
+         Use Intel AES-NI instructions for AES algorithm.
+
+         AES cipher algorithms (FIPS-197). AES uses the Rijndael

          algorithm.
 
          Rijndael appears to be consistently a very good performer in
          algorithm.
 
          Rijndael appears to be consistently a very good performer in

-         both hardware and software across a wide range of computing 
-         environments regardless of its use in feedback or non-feedback 
-         modes. Its key setup time is excellent, and its key agility is 
-         good. Rijndael's very low memory requirements make it very well 
-         suited for restricted-space environments, in which it also 
-         demonstrates excellent performance. Rijndael's operations are 
-         among the easiest to defend against power and timing attacks. 
+         both hardware and software across a wide range of computing
+         environments regardless of its use in feedback or non-feedback
+         modes. Its key setup time is excellent, and its key agility is
+         good. Rijndael's very low memory requirements make it very well
+         suited for restricted-space environments, in which it also
+         demonstrates excellent performance. Rijndael's operations are
+         among the easiest to defend against power and timing attacks.

 
 

-         The AES specifies three key sizes: 128, 192 and 256 bits        
+         The AES specifies three key sizes: 128, 192 and 256 bits

 
          See <http://csrc.nist.gov/encryption/aes/> for more information.
 
 
          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.
+
+config CRYPTO_ANUBIS
+       tristate "Anubis cipher algorithm"
+       select CRYPTO_ALGAPI
+       help
+         Anubis cipher algorithm.
+
+         Anubis is a variable key length cipher which can use keys from
+         128 bits to 320 bits in length.  It was evaluated as a entrant
+         in the NESSIE competition.
+
+         See also:
+         <https://www.cosic.esat.kuleuven.ac.be/nessie/reports/>
+         <http://planeta.terra.com.br/informatica/paulobarreto/AnubisPage.html>
+
+config CRYPTO_ARC4
+       tristate "ARC4 cipher algorithm"
+       select CRYPTO_ALGAPI
+       help
+         ARC4 cipher algorithm.
+
+         ARC4 is a stream cipher using keys ranging from 8 bits to 2048
+         bits in length.  This algorithm is required for driver-based
+         WEP, but it should not be for other purposes because of the
+         weakness of the algorithm.
+
+config CRYPTO_BLOWFISH
+       tristate "Blowfish cipher algorithm"
+       select CRYPTO_ALGAPI
+       help
+         Blowfish cipher algorithm, by Bruce Schneier.
+
+         This is a variable key length cipher which can use keys from 32
+         bits to 448 bits in length.  It's fast, simple and specifically
+         designed for use on "large microprocessors".
+
+         See also:
+         <http://www.schneier.com/blowfish.html>
+
+config CRYPTO_CAMELLIA
+       tristate "Camellia cipher algorithms"
+       depends on CRYPTO
+       select CRYPTO_ALGAPI
+       help
+         Camellia cipher algorithms module.
+
+         Camellia is a symmetric key block cipher developed jointly
+         at NTT and Mitsubishi Electric Corporation.
+
+         The Camellia specifies three key sizes: 128, 192 and 256 bits.
+
+         See also:
+         <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html>
+

 config CRYPTO_CAST5
        tristate "CAST5 (CAST-128) cipher algorithm"
        select CRYPTO_ALGAPI
 config CRYPTO_CAST5
        tristate "CAST5 (CAST-128) cipher algorithm"
        select CRYPTO_ALGAPI


@@ -357,33 +591,18 @@ config CRYPTO_CAST6
          The CAST6 encryption algorithm (synonymous with CAST-256) is
          described in RFC2612.
 
          The CAST6 encryption algorithm (synonymous with CAST-256) is
          described in RFC2612.
 

-config CRYPTO_TEA
-       tristate "TEA, XTEA and XETA cipher algorithms"
+config CRYPTO_DES
+       tristate "DES and Triple DES EDE cipher algorithms"

        select CRYPTO_ALGAPI
        help
        select CRYPTO_ALGAPI
        help

-         TEA cipher algorithm.
-
-         Tiny Encryption Algorithm is a simple cipher that uses
-         many rounds for security.  It is very fast and uses
-         little memory.
-
-         Xtendend Tiny Encryption Algorithm is a modification to
-         the TEA algorithm to address a potential key weakness
-         in the TEA algorithm.
-
-         Xtendend Encryption Tiny Algorithm is a mis-implementation 
-         of the XTEA algorithm for compatibility purposes.
+         DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).

 
 

-config CRYPTO_ARC4
-       tristate "ARC4 cipher algorithm"
+config CRYPTO_FCRYPT
+       tristate "FCrypt cipher algorithm"

        select CRYPTO_ALGAPI
        select CRYPTO_ALGAPI

+       select CRYPTO_BLKCIPHER

        help
        help

-         ARC4 cipher algorithm.
-
-         ARC4 is a stream cipher using keys ranging from 8 bits to 2048
-         bits in length.  This algorithm is required for driver-based 
-         WEP, but it should not be for other purposes because of the
-         weakness of the algorithm.
+         FCrypt algorithm used by RxRPC.

 
 config CRYPTO_KHAZAD
        tristate "Khazad cipher algorithm"
 
 config CRYPTO_KHAZAD
        tristate "Khazad cipher algorithm"


@@ -398,19 +617,46 @@ config CRYPTO_KHAZAD
          See also:
          <http://planeta.terra.com.br/informatica/paulobarreto/KhazadPage.html>
 
          See also:
          <http://planeta.terra.com.br/informatica/paulobarreto/KhazadPage.html>
 

-config CRYPTO_ANUBIS
-       tristate "Anubis cipher algorithm"
-       select CRYPTO_ALGAPI
+config CRYPTO_SALSA20
+       tristate "Salsa20 stream cipher algorithm (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       select CRYPTO_BLKCIPHER

        help
        help

-         Anubis cipher algorithm.
+         Salsa20 stream cipher algorithm.

 
 

-         Anubis is a variable key length cipher which can use keys from 
-         128 bits to 320 bits in length.  It was evaluated as a entrant
-         in the NESSIE competition.
-         
-         See also:
-         <https://www.cosic.esat.kuleuven.ac.be/nessie/reports/>
-         <http://planeta.terra.com.br/informatica/paulobarreto/AnubisPage.html>
+         Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT
+         Stream Cipher Project. See <http://www.ecrypt.eu.org/stream/>
+
+         The Salsa20 stream cipher algorithm is designed by Daniel J.
+         Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>
+
+config CRYPTO_SALSA20_586
+       tristate "Salsa20 stream cipher algorithm (i586) (EXPERIMENTAL)"
+       depends on (X86 || UML_X86) && !64BIT
+       depends on EXPERIMENTAL
+       select CRYPTO_BLKCIPHER
+       help
+         Salsa20 stream cipher algorithm.
+
+         Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT
+         Stream Cipher Project. See <http://www.ecrypt.eu.org/stream/>
+
+         The Salsa20 stream cipher algorithm is designed by Daniel J.
+         Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>
+
+config CRYPTO_SALSA20_X86_64
+       tristate "Salsa20 stream cipher algorithm (x86_64) (EXPERIMENTAL)"
+       depends on (X86 || UML_X86) && 64BIT
+       depends on EXPERIMENTAL
+       select CRYPTO_BLKCIPHER
+       help
+         Salsa20 stream cipher algorithm.
+
+         Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT
+         Stream Cipher Project. See <http://www.ecrypt.eu.org/stream/>
+
+         The Salsa20 stream cipher algorithm is designed by Daniel J.
+         Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>

 
 config CRYPTO_SEED
        tristate "SEED cipher algorithm"
 
 config CRYPTO_SEED
        tristate "SEED cipher algorithm"


@@ -426,58 +672,131 @@ config CRYPTO_SEED
          See also:
          <http://www.kisa.or.kr/kisa/seed/jsp/seed_eng.jsp>
 
          See also:
          <http://www.kisa.or.kr/kisa/seed/jsp/seed_eng.jsp>
 

-
-config CRYPTO_DEFLATE
-       tristate "Deflate compression algorithm"
+config CRYPTO_SERPENT
+       tristate "Serpent cipher algorithm"

        select CRYPTO_ALGAPI
        select CRYPTO_ALGAPI

-       select ZLIB_INFLATE
-       select ZLIB_DEFLATE

        help
        help

-         This is the Deflate algorithm (RFC1951), specified for use in
-         IPSec with the IPCOMP protocol (RFC3173, RFC2394).
-         
-         You will most probably want this if using IPSec.
+         Serpent cipher algorithm, by Anderson, Biham & Knudsen.

 
 

-config CRYPTO_MICHAEL_MIC
-       tristate "Michael MIC keyed digest algorithm"
+         Keys are allowed to be from 0 to 256 bits in length, in steps
+         of 8 bits.  Also includes the 'Tnepres' algorithm, a reversed
+         variant of Serpent for compatibility with old kerneli.org code.
+
+         See also:
+         <http://www.cl.cam.ac.uk/~rja14/serpent.html>
+
+config CRYPTO_TEA
+       tristate "TEA, XTEA and XETA cipher algorithms"

        select CRYPTO_ALGAPI
        help
        select CRYPTO_ALGAPI
        help

-         Michael MIC is used for message integrity protection in TKIP
-         (IEEE 802.11i). This algorithm is required for TKIP, but it
-         should not be used for other purposes because of the weakness
-         of the algorithm.
+         TEA cipher algorithm.

 
 

-config CRYPTO_CRC32C
-       tristate "CRC32c CRC algorithm"
+         Tiny Encryption Algorithm is a simple cipher that uses
+         many rounds for security.  It is very fast and uses
+         little memory.
+
+         Xtendend Tiny Encryption Algorithm is a modification to
+         the TEA algorithm to address a potential key weakness
+         in the TEA algorithm.
+
+         Xtendend Encryption Tiny Algorithm is a mis-implementation
+         of the XTEA algorithm for compatibility purposes.
+
+config CRYPTO_TWOFISH
+       tristate "Twofish cipher algorithm"

        select CRYPTO_ALGAPI
        select CRYPTO_ALGAPI

-       select LIBCRC32C
+       select CRYPTO_TWOFISH_COMMON

        help
        help

-         Castagnoli, et al Cyclic Redundancy-Check Algorithm.  Used
-         by iSCSI for header and data digests and by others.
-         See Castagnoli93.  This implementation uses lib/libcrc32c.
-          Module will be crc32c.
+         Twofish cipher algorithm.

 
 

-config CRYPTO_CAMELLIA
-       tristate "Camellia cipher algorithms"
-       depends on CRYPTO
+         Twofish was submitted as an AES (Advanced Encryption Standard)
+         candidate cipher by researchers at CounterPane Systems.  It is a
+         16 round block cipher supporting key sizes of 128, 192, and 256
+         bits.
+
+         See also:
+         <http://www.schneier.com/twofish.html>
+
+config CRYPTO_TWOFISH_COMMON
+       tristate
+       help
+         Common parts of the Twofish cipher algorithm shared by the
+         generic c and the assembler implementations.
+
+config CRYPTO_TWOFISH_586
+       tristate "Twofish cipher algorithms (i586)"
+       depends on (X86 || UML_X86) && !64BIT

        select CRYPTO_ALGAPI
        select CRYPTO_ALGAPI

+       select CRYPTO_TWOFISH_COMMON

        help
        help

-         Camellia cipher algorithms module.
+         Twofish cipher algorithm.

 
 

-         Camellia is a symmetric key block cipher developed jointly
-         at NTT and Mitsubishi Electric Corporation.
+         Twofish was submitted as an AES (Advanced Encryption Standard)
+         candidate cipher by researchers at CounterPane Systems.  It is a
+         16 round block cipher supporting key sizes of 128, 192, and 256
+         bits.

 
 

-         The Camellia specifies three key sizes: 128, 192 and 256 bits.
+         See also:
+         <http://www.schneier.com/twofish.html>
+
+config CRYPTO_TWOFISH_X86_64
+       tristate "Twofish cipher algorithm (x86_64)"
+       depends on (X86 || UML_X86) && 64BIT
+       select CRYPTO_ALGAPI
+       select CRYPTO_TWOFISH_COMMON
+       help
+         Twofish cipher algorithm (x86_64).
+
+         Twofish was submitted as an AES (Advanced Encryption Standard)
+         candidate cipher by researchers at CounterPane Systems.  It is a
+         16 round block cipher supporting key sizes of 128, 192, and 256
+         bits.

 
          See also:
 
          See also:

-         <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html>
+         <http://www.schneier.com/twofish.html>

 
 

-config CRYPTO_TEST
-       tristate "Testing module"
-       depends on m
+comment "Compression"
+
+config CRYPTO_DEFLATE
+       tristate "Deflate compression algorithm"
+       select CRYPTO_ALGAPI
+       select ZLIB_INFLATE
+       select ZLIB_DEFLATE
+       help
+         This is the Deflate algorithm (RFC1951), specified for use in
+         IPSec with the IPCOMP protocol (RFC3173, RFC2394).
+
+         You will most probably want this if using IPSec.
+
+config CRYPTO_ZLIB
+       tristate "Zlib compression algorithm"
+       select CRYPTO_PCOMP
+       select ZLIB_INFLATE
+       select ZLIB_DEFLATE
+       select NLATTR
+       help
+         This is the zlib algorithm.
+
+config CRYPTO_LZO
+       tristate "LZO compression algorithm"

        select CRYPTO_ALGAPI
        select CRYPTO_ALGAPI

+       select LZO_COMPRESS
+       select LZO_DECOMPRESS

        help
        help

-         Quick & dirty crypto test module.
+         This is the LZO algorithm.
+
+comment "Random Number Generation"
+
+config CRYPTO_ANSI_CPRNG
+       tristate "Pseudo Random Number Generation for Cryptographic modules"
+       default m
+       select CRYPTO_AES
+       select CRYPTO_RNG
+       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

 
 source "drivers/crypto/Kconfig"
 
 
 source "drivers/crypto/Kconfig"