Merge with /shiny/git/linux-2.6/.git

[karo-tx-linux.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 90d6089d60ed8c11e251da02e6f090bcc4129bb9..256c0b1fed10ddfb8e3f242651ccdefdd970cfa9 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -146,7 +146,7 @@ config CRYPTO_SERPENT
 
 config CRYPTO_AES
        tristate "AES cipher algorithms"
-       depends on CRYPTO && !((X86 || UML_X86) && !64BIT)
+       depends on CRYPTO && !(X86 || UML_X86)
        help
          AES cipher algorithms (FIPS-197). AES uses the Rijndael 
          algorithm.
@@ -184,6 +184,26 @@ config CRYPTO_AES_586
 
          See <http://csrc.nist.gov/encryption/aes/> for more information.
 
+config CRYPTO_AES_X86_64
+       tristate "AES cipher algorithms (x86_64)"
+       depends on CRYPTO && ((X86 || UML_X86) && 64BIT)
+       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_CAST5
        tristate "CAST5 (CAST-128) cipher algorithm"
        depends on CRYPTO