Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[sfrench/cifs-2.6.git] / arch / arm / crypto / Kconfig

diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig
index 27ed1b1cd1d798d83eda3d453b96ae47fd1e284f..13f1b4c289d4c15aa7f1f1abc8a8fe3419e7619c 100644 (file)
--- a/arch/arm/crypto/Kconfig
+++ b/arch/arm/crypto/Kconfig
@@ -88,9 +88,9 @@ config CRYPTO_AES_ARM
 config CRYPTO_AES_ARM_BS
        tristate "Bit sliced AES using NEON instructions"
        depends on KERNEL_MODE_NEON
-       select CRYPTO_ALGAPI
        select CRYPTO_AES_ARM
-       select CRYPTO_ABLK_HELPER
+       select CRYPTO_BLKCIPHER
+       select CRYPTO_SIMD
        help
          Use a faster and more secure NEON based implementation of AES in CBC,
          CTR and XTS modes
@@ -104,8 +104,8 @@ config CRYPTO_AES_ARM_BS
 config CRYPTO_AES_ARM_CE
        tristate "Accelerated AES using ARMv8 Crypto Extensions"
        depends on KERNEL_MODE_NEON
-       select CRYPTO_ALGAPI
-       select CRYPTO_ABLK_HELPER
+       select CRYPTO_BLKCIPHER
+       select CRYPTO_SIMD
        help
          Use an implementation of AES in CBC, CTR and XTS modes that uses
          ARMv8 Crypto Extensions
@@ -120,4 +120,14 @@ config CRYPTO_GHASH_ARM_CE
          that uses the 64x64 to 128 bit polynomial multiplication (vmull.p64)
          that is part of the ARMv8 Crypto Extensions
 
+config CRYPTO_CRCT10DIF_ARM_CE
+       tristate "CRCT10DIF digest algorithm using PMULL instructions"
+       depends on KERNEL_MODE_NEON && CRC_T10DIF
+       select CRYPTO_HASH
+
+config CRYPTO_CRC32_ARM_CE
+       tristate "CRC32(C) digest algorithm using CRC and/or PMULL instructions"
+       depends on KERNEL_MODE_NEON && CRC32
+       select CRYPTO_HASH
+
 endif