Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

[linux-drm-fsl-dcu.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 90d467c99c2cd514f34f8f9665984f92452f0f4c..cbae8392ce11b848e5573194eb8591a175815822 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -20,16 +20,21 @@ config CRYPTO_BLKCIPHER
        tristate
        select CRYPTO_ALGAPI
 
+config CRYPTO_HASH
+       tristate
+       select CRYPTO_ALGAPI
+
 config CRYPTO_MANAGER
        tristate "Cryptographic algorithm manager"
        select CRYPTO_ALGAPI
-       default m
        help
          Create default cryptographic template instantiations such as
          cbc(aes).
 
 config CRYPTO_HMAC
-       bool "HMAC support"
+       tristate "HMAC support"
+       select CRYPTO_HASH
+       select CRYPTO_MANAGER
        help
          HMAC: Keyed-Hashing for Message Authentication (RFC2104).
          This is required for IPSec.
@@ -126,6 +131,7 @@ config CRYPTO_TGR192
 config CRYPTO_ECB
        tristate "ECB support"
        select CRYPTO_BLKCIPHER
+       select CRYPTO_MANAGER
        default m
        help
          ECB: Electronic CodeBook mode
@@ -135,6 +141,7 @@ config CRYPTO_ECB
 config CRYPTO_CBC
        tristate "CBC support"
        select CRYPTO_BLKCIPHER
+       select CRYPTO_MANAGER
        default m
        help
          CBC: Cipher Block Chaining mode
@@ -150,6 +157,7 @@ config CRYPTO_DES_S390
        tristate "DES and Triple DES cipher algorithms (s390)"
        depends on S390
        select CRYPTO_ALGAPI
+       select CRYPTO_BLKCIPHER
        help
          DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
 
@@ -298,6 +306,7 @@ config CRYPTO_AES_S390
        tristate "AES cipher algorithms (s390)"
        depends on S390
        select CRYPTO_ALGAPI
+       select CRYPTO_BLKCIPHER
        help
          This is the s390 hardware accelerated implementation of the
          AES cipher algorithms (FIPS-197). AES uses the Rijndael