Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 6d2f0c8d419aaab7f855fdfdc7e02820a69ec6dd..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
        tristate "PadLock driver for AES algorithm"
        depends on CRYPTO_DEV_PADLOCK
        select CRYPTO_BLKCIPHER

+       select CRYPTO_AES

        help
          Use VIA PadLock for AES algorithm.
 
        help
          Use VIA PadLock for AES algorithm.
 


@@ -101,6 +102,19 @@ config CRYPTO_SHA256_S390
          This version of SHA implements a 256 bit hash with 128 bits of
          security against collision attacks.
 
          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
 config CRYPTO_DES_S390
        tristate "DES and Triple DES cipher algorithms"
        depends on S390


@@ -160,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.
 
          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
 endif # CRYPTO_HW