Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 2cac445b02fde0f626946d2dd0021322bcef07c4..473d31288ad86ed7b93a7ed87c07fd5cded87f1f 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -62,19 +62,32 @@ config CRYPTO_DEV_GEODE
          will be called geode-aes.
 
 config ZCRYPT
-       tristate "Support for PCI-attached cryptographic adapters"
+       tristate "Support for s390 cryptographic adapters"
        depends on S390
        select HW_RANDOM
        help
-         Select this option if you want to use a PCI-attached cryptographic
-         adapter like:
-         + PCI Cryptographic Accelerator (PCICA)
-         + PCI Cryptographic Coprocessor (PCICC)
+         Select this option if you want to enable support for
+         s390 cryptographic adapters like:
          + PCI-X Cryptographic Coprocessor (PCIXCC)
-         + Crypto Express2 Coprocessor (CEX2C)
-         + Crypto Express2 Accelerator (CEX2A)
-         + Crypto Express3 Coprocessor (CEX3C)
-         + Crypto Express3 Accelerator (CEX3A)
+         + Crypto Express 2,3,4 or 5 Coprocessor (CEXxC)
+         + Crypto Express 2,3,4 or 5 Accelerator (CEXxA)
+         + Crypto Express 4 or 5 EP11 Coprocessor (CEXxP)
+
+config PKEY
+       tristate "Kernel API for protected key handling"
+       depends on S390
+       depends on ZCRYPT
+       help
+         With this option enabled the pkey kernel module provides an API
+         for creation and handling of protected keys. Other parts of the
+         kernel or userspace applications may use these functions.
+
+         Select this option if you want to enable the kernel and userspace
+         API for proteced key handling.
+
+         Please note that creation of protected keys from secure keys
+         requires to have at least one CEX card in coprocessor mode
+         available at runtime.
 
 config CRYPTO_SHA1_S390
        tristate "SHA1 digest algorithm"
@@ -124,6 +137,7 @@ config CRYPTO_AES_S390
        depends on S390
        select CRYPTO_ALGAPI
        select CRYPTO_BLKCIPHER
+       select PKEY
        help
          This is the s390 hardware accelerated implementation of the
          AES cipher algorithms (FIPS-197).
@@ -445,6 +459,7 @@ config CRYPTO_DEV_ATMEL_AES
 
 config CRYPTO_DEV_ATMEL_TDES
        tristate "Support for Atmel DES/TDES hw accelerator"
+       depends on HAS_DMA
        depends on ARCH_AT91 || COMPILE_TEST
        select CRYPTO_DES
        select CRYPTO_BLKCIPHER
@@ -458,6 +473,7 @@ config CRYPTO_DEV_ATMEL_TDES
 
 config CRYPTO_DEV_ATMEL_SHA
        tristate "Support for Atmel SHA hw accelerator"
+       depends on HAS_DMA
        depends on ARCH_AT91 || COMPILE_TEST
        select CRYPTO_HASH
        help
@@ -569,6 +585,7 @@ config CRYPTO_DEV_ROCKCHIP
 
 config CRYPTO_DEV_MEDIATEK
        tristate "MediaTek's EIP97 Cryptographic Engine driver"
+       depends on HAS_DMA
        depends on (ARM && ARCH_MEDIATEK) || COMPILE_TEST
        select CRYPTO_AES
        select CRYPTO_AEAD