Merge tag 'chrome-platform-for-linus-4.13' of git://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / arch / arm64 / crypto / Kconfig

diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig
index 450a85df041a668ebd6a0bf87dbbe68c7ca5d145..d92293747d63149f8101ff1290044f8283ab0b24 100644 (file)
--- a/arch/arm64/crypto/Kconfig
+++ b/arch/arm64/crypto/Kconfig
@@ -37,10 +37,14 @@ config CRYPTO_CRCT10DIF_ARM64_CE
        select CRYPTO_HASH
 
 config CRYPTO_CRC32_ARM64_CE
-       tristate "CRC32 and CRC32C digest algorithms using PMULL instructions"
-       depends on KERNEL_MODE_NEON && CRC32
+       tristate "CRC32 and CRC32C digest algorithms using ARMv8 extensions"
+       depends on CRC32
        select CRYPTO_HASH
 
+config CRYPTO_AES_ARM64
+       tristate "AES core cipher using scalar instructions"
+       select CRYPTO_AES
+
 config CRYPTO_AES_ARM64_CE
        tristate "AES core cipher using ARMv8 Crypto Extensions"
        depends on ARM64 && KERNEL_MODE_NEON
@@ -67,9 +71,17 @@ config CRYPTO_AES_ARM64_NEON_BLK
        select CRYPTO_AES
        select CRYPTO_SIMD
 
-config CRYPTO_CRC32_ARM64
-       tristate "CRC32 and CRC32C using optional ARMv8 instructions"
-       depends on ARM64
-       select CRYPTO_HASH
+config CRYPTO_CHACHA20_NEON
+       tristate "NEON accelerated ChaCha20 symmetric cipher"
+       depends on KERNEL_MODE_NEON
+       select CRYPTO_BLKCIPHER
+       select CRYPTO_CHACHA20
+
+config CRYPTO_AES_ARM64_BS
+       tristate "AES in ECB/CBC/CTR/XTS modes using bit-sliced NEON algorithm"
+       depends on KERNEL_MODE_NEON
+       select CRYPTO_BLKCIPHER
+       select CRYPTO_AES_ARM64_NEON_BLK
+       select CRYPTO_SIMD
 
 endif