diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 10:58:59 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 10:58:59 +0000 |
| commit | df762eccbadf87850fbee444d729e0f1b1e946f1 (patch) | |
| tree | 1bf47bbbd4ea91e343f983b3b50ec2ec73a739e1 /crypto | |
| parent | ec1e20a02fe33b767ffcca8920a32211492416d7 (diff) | |
| parent | 70d42126877b9faa272d446a6de5917614c28dd9 (diff) | |
| download | linux-stable-df762eccbadf87850fbee444d729e0f1b1e946f1.tar.gz linux-stable-df762eccbadf87850fbee444d729e0f1b1e946f1.tar.bz2 linux-stable-df762eccbadf87850fbee444d729e0f1b1e946f1.zip | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/include/asm/atomic.h
arch/arm/include/asm/hardirq.h
arch/arm/kernel/smp.c
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Kconfig | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 69ce573f1224..71f337aefa39 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -776,6 +776,22 @@ config CRYPTO_AES_ARM See <http://csrc.nist.gov/encryption/aes/> for more information. +config CRYPTO_AES_ARM_BS + tristate "Bit sliced AES using NEON instructions" + depends on ARM && KERNEL_MODE_NEON + select CRYPTO_ALGAPI + select CRYPTO_AES_ARM + select CRYPTO_ABLK_HELPER + help + Use a faster and more secure NEON based implementation of AES in CBC, + CTR and XTS modes + + Bit sliced AES gives around 45% speedup on Cortex-A15 for CTR mode + and for XTS mode encryption, CBC and XTS mode decryption speedup is + around 25%. (CBC encryption speed is not affected by this driver.) + This implementation does not rely on any lookup tables so it is + believed to be invulnerable to cache timing attacks. + config CRYPTO_ANUBIS tristate "Anubis cipher algorithm" select CRYPTO_ALGAPI |