This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 2e2c339..991d41d 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -120,7 +120,7 @@ config CRYPTO_SERPENT
 
 config CRYPTO_AES
        tristate "AES cipher algorithms"
-       depends on CRYPTO && !(X86 && !X86_64)
+       depends on CRYPTO
        help
          AES cipher algorithms (FIPS-197). AES uses the Rijndael 
          algorithm.
@@ -138,26 +138,6 @@ config CRYPTO_AES
 
          See http://csrc.nist.gov/CryptoToolkit/aes/ for more information.
 
-config CRYPTO_AES_586
-       tristate "AES cipher algorithms (i586)"
-       depends on CRYPTO && (X86 && !X86_64)
-       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
@@ -197,19 +177,6 @@ config CRYPTO_ARC4
          WEP, but it should not be for other purposes because of the
          weakness of the algorithm.
 
-config CRYPTO_KHAZAD
-       tristate "Khazad cipher algorithm"
-       depends on CRYPTO
-       help
-         Khazad cipher algorithm.
-
-         Khazad was a finalist in the initial NESSIE competition.  It is
-         an algorithm optimized for 64-bit processors with good performance
-         on 32-bit processors.  Khazad uses an 128 bit key size.
-
-         See also:
-         http://planeta.terra.com.br/informatica/paulobarreto/KhazadPage.html
-
 config CRYPTO_DEFLATE
        tristate "Deflate compression algorithm"
        depends on CRYPTO