vserver 2.0 rc7

[linux-2.6.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index a477f2a..90d6089 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -79,6 +79,19 @@ config CRYPTO_WP512
          See also:
          <http://planeta.terra.com.br/informatica/paulobarreto/WhirlpoolPage.html>
 
+config CRYPTO_TGR192
+       tristate "Tiger digest algorithms"
+       depends on CRYPTO
+       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.
+
+         See also:
+         <http://www.cs.technion.ac.il/~biham/Reports/Tiger/>.
+
 config CRYPTO_DES
        tristate "DES and Triple DES EDE cipher algorithms"
        depends on CRYPTO
@@ -133,7 +146,7 @@ config CRYPTO_SERPENT
 
 config CRYPTO_AES
        tristate "AES cipher algorithms"
-       depends on CRYPTO && !(X86 && !X86_64)
+       depends on CRYPTO && !((X86 || UML_X86) && !64BIT)
        help
          AES cipher algorithms (FIPS-197). AES uses the Rijndael 
          algorithm.
@@ -153,7 +166,7 @@ config CRYPTO_AES
 
 config CRYPTO_AES_586
        tristate "AES cipher algorithms (i586)"
-       depends on CRYPTO && (X86 && !X86_64)
+       depends on CRYPTO && ((X86 || UML_X86) && !64BIT)
        help
          AES cipher algorithms (FIPS-197). AES uses the Rijndael 
          algorithm.