Merge branch 'topic/atmel' into for-linus

[linux-2.6-omap-h63xx.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index edf6c71b576ec26e24b0b25f795177694ebe7e98..8dde4fcf99c947b7c292be0a775b102e43260879 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -276,19 +276,19 @@ config CRYPTO_CRC32C_INTEL
 
 config CRYPTO_MD4
        tristate "MD4 digest algorithm"
 
 config CRYPTO_MD4
        tristate "MD4 digest algorithm"

-       select CRYPTO_ALGAPI
+       select CRYPTO_HASH

        help
          MD4 message digest algorithm (RFC1320).
 
 config CRYPTO_MD5
        tristate "MD5 digest algorithm"
        help
          MD4 message digest algorithm (RFC1320).
 
 config CRYPTO_MD5
        tristate "MD5 digest algorithm"

-       select CRYPTO_ALGAPI
+       select CRYPTO_HASH

        help
          MD5 message digest algorithm (RFC1321).
 
 config CRYPTO_MICHAEL_MIC
        tristate "Michael MIC keyed digest algorithm"
        help
          MD5 message digest algorithm (RFC1321).
 
 config CRYPTO_MICHAEL_MIC
        tristate "Michael MIC keyed digest algorithm"

-       select CRYPTO_ALGAPI
+       select CRYPTO_HASH

        help
          Michael MIC is used for message integrity protection in TKIP
          (IEEE 802.11i). This algorithm is required for TKIP, but it
        help
          Michael MIC is used for message integrity protection in TKIP
          (IEEE 802.11i). This algorithm is required for TKIP, but it


@@ -351,13 +351,13 @@ config CRYPTO_RMD320
 
 config CRYPTO_SHA1
        tristate "SHA1 digest algorithm"
 
 config CRYPTO_SHA1
        tristate "SHA1 digest algorithm"

-       select CRYPTO_ALGAPI
+       select CRYPTO_HASH

        help
          SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
 
 config CRYPTO_SHA256
        tristate "SHA224 and SHA256 digest algorithm"
        help
          SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
 
 config CRYPTO_SHA256
        tristate "SHA224 and SHA256 digest algorithm"

-       select CRYPTO_ALGAPI
+       select CRYPTO_HASH

        help
          SHA256 secure hash standard (DFIPS 180-2).
 
        help
          SHA256 secure hash standard (DFIPS 180-2).
 


@@ -369,7 +369,7 @@ config CRYPTO_SHA256
 
 config CRYPTO_SHA512
        tristate "SHA384 and SHA512 digest algorithms"
 
 config CRYPTO_SHA512
        tristate "SHA384 and SHA512 digest algorithms"

-       select CRYPTO_ALGAPI
+       select CRYPTO_HASH

        help
          SHA512 secure hash standard (DFIPS 180-2).
 
        help
          SHA512 secure hash standard (DFIPS 180-2).
 


@@ -381,7 +381,7 @@ config CRYPTO_SHA512
 
 config CRYPTO_TGR192
        tristate "Tiger digest algorithms"
 
 config CRYPTO_TGR192
        tristate "Tiger digest algorithms"

-       select CRYPTO_ALGAPI
+       select CRYPTO_HASH

        help
          Tiger hash algorithm 192, 160 and 128-bit hashes
 
        help
          Tiger hash algorithm 192, 160 and 128-bit hashes
 


@@ -394,7 +394,7 @@ config CRYPTO_TGR192
 
 config CRYPTO_WP512
        tristate "Whirlpool digest algorithms"
 
 config CRYPTO_WP512
        tristate "Whirlpool digest algorithms"

-       select CRYPTO_ALGAPI
+       select CRYPTO_HASH

        help
          Whirlpool hash algorithm 512, 384 and 256-bit hashes
 
        help
          Whirlpool hash algorithm 512, 384 and 256-bit hashes