Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index ea7b19047270d8e667fdb28e7354e41e2e417483..e522144cba3af9bc9d9e5e9bbc1e5dcb05e693c0 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.
 
@@ -102,7 +103,7 @@ config CRYPTO_SHA256_S390
          security against collision attacks.
 
 config CRYPTO_SHA512_S390
-       tristate "SHA512 digest algorithm"
+       tristate "SHA384 and SHA512 digest algorithm"
        depends on S390
        select CRYPTO_ALGAPI
        help
@@ -110,7 +111,9 @@ config CRYPTO_SHA512_S390
          SHA512 secure hash standard.
 
          This version of SHA implements a 512 bit hash with 256 bits of
-         security against collision attacks.
+         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"
@@ -171,4 +174,30 @@ config CRYPTO_DEV_HIFN_795X_RNG
          Select this option if you want to enable the random number generator
          on the HIFN 795x crypto adapters.
 
+config CRYPTO_DEV_TALITOS
+       tristate "Talitos Freescale Security Engine (SEC)"
+       select CRYPTO_ALGAPI
+       select CRYPTO_AUTHENC
+       select HW_RANDOM
+       depends on FSL_SOC
+       help
+         Say 'Y' here to use the Freescale Security Engine (SEC)
+         to offload cryptographic algorithm computation.
+
+         The Freescale SEC is present on PowerQUICC 'E' processors, such
+         as the MPC8349E and MPC8548E.
+
+         To compile this driver as a module, choose M here: the module
+         will be called talitos.
+
+config CRYPTO_DEV_IXP4XX
+       tristate "Driver for IXP4xx crypto hardware acceleration"
+       depends on ARCH_IXP4XX
+       select CRYPTO_DES
+       select CRYPTO_ALGAPI
+       select CRYPTO_AUTHENC
+       select CRYPTO_BLKCIPHER
+       help
+         Driver for the IXP4xx NPE crypto engine.
+
 endif # CRYPTO_HW