X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=crypto%2FKconfig;h=898acc5c1967b5d700901a8acf9a15b00f079049;hb=bdc08942897f6be33d00bb659761516f4652836d;hp=221356b4150cb7c4586f6ed44d27429bd317f869;hpb=974e4b752ee623854c5dc2bbfc7c7725029ce173;p=linux-2.6

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 221356b415..898acc5c19 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -74,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.
 
@@ -494,7 +495,20 @@ config CRYPTO_SALSA20_586
 	depends on (X86 || UML_X86) && !64BIT
 	depends on EXPERIMENTAL
 	select CRYPTO_BLKCIPHER
-	select CRYPTO_SALSA20
+	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.
 
@@ -553,6 +567,8 @@ config CRYPTO_TEST
 	tristate "Testing module"
 	depends on m
 	select CRYPTO_ALGAPI
+	select CRYPTO_AEAD
+	select CRYPTO_BLKCIPHER
 	help
 	  Quick & dirty crypto test module.