include/asm-x86/voyager.h: checkpatch cleanups - formatting only

[sfrench/cifs-2.6.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 0d89f77428e5f062f2c51838e226852c6f062838..69f1be6816f7cc6740ff206cf173e12feac7450e 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -34,6 +34,7 @@ config CRYPTO_BLKCIPHER
 
 config CRYPTO_SEQIV
        tristate "Sequence Number IV Generator"
+       select CRYPTO_AEAD
        select CRYPTO_BLKCIPHER
        help
          This IV generator generates an IV based on a sequence number by
@@ -73,6 +74,7 @@ config CRYPTO_XCBC
 config CRYPTO_NULL
        tristate "Null algorithms"
        select CRYPTO_ALGAPI
+       select CRYPTO_BLKCIPHER
        help
          These are 'Null' algorithms, used by IPsec, which do nothing.
 
@@ -488,6 +490,34 @@ config CRYPTO_SALSA20
          The Salsa20 stream cipher algorithm is designed by Daniel J.
          Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>
 
+config CRYPTO_SALSA20_586
+       tristate "Salsa20 stream cipher algorithm (i586) (EXPERIMENTAL)"
+       depends on (X86 || UML_X86) && !64BIT
+       depends on EXPERIMENTAL
+       select CRYPTO_BLKCIPHER
+       help
+         Salsa20 stream cipher algorithm.
+
+         Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT
+         Stream Cipher Project. See <http://www.ecrypt.eu.org/stream/>
+
+         The Salsa20 stream cipher algorithm is designed by Daniel J.
+         Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>
+
+config CRYPTO_SALSA20_X86_64
+       tristate "Salsa20 stream cipher algorithm (x86_64) (EXPERIMENTAL)"
+       depends on (X86 || UML_X86) && 64BIT
+       depends on EXPERIMENTAL
+       select CRYPTO_BLKCIPHER
+       help
+         Salsa20 stream cipher algorithm.
+
+         Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT
+         Stream Cipher Project. See <http://www.ecrypt.eu.org/stream/>
+
+         The Salsa20 stream cipher algorithm is designed by Daniel J.
+         Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>
+
 config CRYPTO_DEFLATE
        tristate "Deflate compression algorithm"
        select CRYPTO_ALGAPI
@@ -537,12 +567,15 @@ config CRYPTO_TEST
        tristate "Testing module"
        depends on m
        select CRYPTO_ALGAPI
+       select CRYPTO_AEAD
+       select CRYPTO_BLKCIPHER
        help
          Quick & dirty crypto test module.
 
 config CRYPTO_AUTHENC
        tristate "Authenc support"
        select CRYPTO_AEAD
+       select CRYPTO_BLKCIPHER
        select CRYPTO_MANAGER
        select CRYPTO_HASH
        help