summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2016-11-22 20:08:33 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2016-11-28 21:23:20 +0800
commit85671860caaca2f3831f675d48356810731a33eb (patch)
treeec42ed47b112370e1e870c3aff6bad8163d22b97 /crypto
parenteed93e0ce335fbe69b8e6847eca3f2c643010112 (diff)
downloadlinux-stable-85671860caaca2f3831f675d48356810731a33eb.tar.gz
linux-stable-85671860caaca2f3831f675d48356810731a33eb.tar.bz2
linux-stable-85671860caaca2f3831f675d48356810731a33eb.zip
crypto: aesni - Convert to skcipher
This patch converts aesni (including fpu) over to the skcipher interface. The LRW implementation has been removed as the generic LRW code can now be used directly on top of the accelerated ECB implementation. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/Kconfig7
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index bb7942464326..160f08e721cc 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -942,14 +942,13 @@ config CRYPTO_AES_X86_64
config CRYPTO_AES_NI_INTEL
tristate "AES cipher algorithms (AES-NI)"
depends on X86
+ select CRYPTO_AEAD
select CRYPTO_AES_X86_64 if 64BIT
select CRYPTO_AES_586 if !64BIT
- select CRYPTO_CRYPTD
- select CRYPTO_ABLK_HELPER
select CRYPTO_ALGAPI
+ select CRYPTO_BLKCIPHER
select CRYPTO_GLUE_HELPER_X86 if 64BIT
- select CRYPTO_LRW
- select CRYPTO_XTS
+ select CRYPTO_SIMD
help
Use Intel AES-NI instructions for AES algorithm.