Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 6d2f0c8d419aaab7f855fdfdc7e02820a69ec6dd..110c4dc781fe709e9ee8dbc38f2fe0b2567711e3 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -27,6 +27,7 @@ config CRYPTO_DEV_PADLOCK_AES
        tristate "PadLock driver for AES algorithm"
        depends on CRYPTO_DEV_PADLOCK
        select CRYPTO_BLKCIPHER
+       select CRYPTO_AES
        help
          Use VIA PadLock for AES algorithm.
 
@@ -82,6 +83,13 @@ config ZCRYPT_MONOLITHIC
          that contains all parts of the crypto device driver (ap bus,
          request router and all the card drivers).
 
+config OMAP_SHA1_MD5
+       tristate "Support for OMAP SHA1/MD5 hw engine"
+       depends on ARCH_OMAP24XX && CRYPTO_SHA1 && CRYPTO_MD5
+       help
+         OMAP processors have SHA1/MD5 module accelerator. Select this if you
+         want to use the OMAP module for SHA1/MD5 algorithms.
+
 config CRYPTO_SHA1_S390
        tristate "SHA1 digest algorithm"
        depends on S390
@@ -101,6 +109,19 @@ config CRYPTO_SHA256_S390
          This version of SHA implements a 256 bit hash with 128 bits of
          security against collision attacks.
 
+config CRYPTO_SHA512_S390
+       tristate "SHA384 and SHA512 digest algorithm"
+       depends on S390
+       select CRYPTO_ALGAPI
+       help
+         This is the s390 hardware accelerated implementation of the
+         SHA512 secure hash standard.
+
+         This version of SHA implements a 512 bit hash with 256 bits of
+         security against collision attacks. The code also includes SHA-384,
+         a 384 bit hash with 192 bits of security against collision attacks.
+
+
 config CRYPTO_DES_S390
        tristate "DES and Triple DES cipher algorithms"
        depends on S390