vserver 1.9.5.x5

[linux-2.6.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 9916a18..a477f2a 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -73,11 +73,11 @@ 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:
-         http://planeta.terra.com.br/informatica/paulobarreto/WhirlpoolPage.html
+         <http://planeta.terra.com.br/informatica/paulobarreto/WhirlpoolPage.html>
 
 config CRYPTO_DES
        tristate "DES and Triple DES EDE cipher algorithms"
@@ -102,7 +102,7 @@ config CRYPTO_BLOWFISH
          designed for use on "large microprocessors".
          
          See also:
-         http://www.schneier.com/blowfish.html
+         <http://www.schneier.com/blowfish.html>
 
 config CRYPTO_TWOFISH
        tristate "Twofish cipher algorithm"
@@ -116,7 +116,7 @@ config CRYPTO_TWOFISH
          bits.
          
          See also:
-         http://www.schneier.com/twofish.html
+         <http://www.schneier.com/twofish.html>
 
 config CRYPTO_SERPENT
        tristate "Serpent cipher algorithm"
@@ -125,10 +125,11 @@ 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
+         <http://www.cl.cam.ac.uk/~rja14/serpent.html>
 
 config CRYPTO_AES
        tristate "AES cipher algorithms"
@@ -148,7 +149,7 @@ config CRYPTO_AES
 
          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.
 
 config CRYPTO_AES_586
        tristate "AES cipher algorithms (i586)"
@@ -168,7 +169,7 @@ config CRYPTO_AES_586
 
          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.
 
 config CRYPTO_CAST5
        tristate "CAST5 (CAST-128) cipher algorithm"
@@ -220,7 +221,22 @@ config CRYPTO_KHAZAD
          on 32-bit processors.  Khazad uses an 128 bit key size.
 
          See also:
-         http://planeta.terra.com.br/informatica/paulobarreto/KhazadPage.html
+         <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"
@@ -258,5 +274,6 @@ config CRYPTO_TEST
        help
          Quick & dirty crypto test module.
 
+source "drivers/crypto/Kconfig"
 endmenu