upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index c0fea8d..cdaa065 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -73,7 +73,7 @@ config CRYPTO_WP512
        help
          Whirlpool hash algorithm 512, 384 and 256-bit hashes
 
-         Whirlpool-512 is part of the NESSIE cryptographic primtives.
+         Whirlpool-512 is part of the NESSIE cryptographic primitives.
          Whirlpool will be part of the ISO/IEC 10118-3:2003(E) standard
 
          See also:
@@ -125,7 +125,8 @@ config CRYPTO_SERPENT
          Serpent cipher algorithm, by Anderson, Biham & Knudsen.
 
          Keys are allowed to be from 0 to 256 bits in length, in steps
-         of 8 bits.
+         of 8 bits.  Also includes the 'Tnepres' algorithm, a reversed
+         variant of Serpent for compatibility with old kerneli code.
 
          See also:
          http://www.cl.cam.ac.uk/~rja14/serpent.html
@@ -222,6 +223,21 @@ config CRYPTO_KHAZAD
          See also:
          http://planeta.terra.com.br/informatica/paulobarreto/KhazadPage.html
 
+config CRYPTO_ANUBIS
+       tristate "Anubis cipher algorithm"
+       depends on CRYPTO
+       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_DEFLATE
        tristate "Deflate compression algorithm"
        depends on CRYPTO
@@ -259,24 +275,23 @@ config CRYPTO_TEST
          Quick & dirty crypto test module.
 
 config CRYPTO_SIGNATURE
-       bool "In-kernel signature checker (EXPERIMENTAL)"
-       depends on CRYPTO
-       help
-         Signature checker (used for module sig checking).
+      bool "In-kernel signature checker (EXPERIMENTAL)"
+      depends on CRYPTO
+      help
+        Signature checker (used for module sig checking).
 
 config CRYPTO_SIGNATURE_DSA
-       bool "Handle DSA signatures (EXPERIMENTAL)"
-       depends on CRYPTO_SIGNATURE
-       select CRYPTO_MPILIB
-       help
-         DSA Signature checker.
+      bool "Handle DSA signatures (EXPERIMENTAL)"
+      depends on CRYPTO_SIGNATURE
+      select CRYPTO_MPILIB
+      help
+        DSA Signature checker.
 
 config CRYPTO_MPILIB
-       bool "Multiprecision maths library (EXPERIMENTAL)"
-       depends on CRYPTO
-       help
-         Multiprecision maths library from GnuPG
-       
+      bool "Multiprecision maths library (EXPERIMENTAL)"
+      depends on CRYPTO
+      help
+        Multiprecision maths library from GnuPG
 
 endmenu