summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2018-02-20 08:48:15 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2018-03-02 17:03:28 +0100
commit4bd969243143e224d5aa450fdea1c882a75aa58e (patch)
treeaf3056d17ac2eec2789bf9f86353b84dc579be58 /crypto
parentcrypto: x86/cast6-avx - remove LRW algorithm (diff)
downloadlinux-4bd969243143e224d5aa450fdea1c882a75aa58e.tar.xz
linux-4bd969243143e224d5aa450fdea1c882a75aa58e.zip
crypto: x86/cast6-avx - convert to skcipher interface
Convert the AVX implementation of CAST6 from the (deprecated) ablkcipher and blkcipher interfaces over to the skcipher interface. Note that this includes replacing the use of ablk_helper with crypto_simd. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/Kconfig9
1 files changed, 4 insertions, 5 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 1e5ee62a11f6..536a7fac205f 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1260,12 +1260,11 @@ config CRYPTO_CAST6
config CRYPTO_CAST6_AVX_X86_64
tristate "CAST6 (CAST-256) cipher algorithm (x86_64/AVX)"
depends on X86 && 64BIT
- select CRYPTO_ALGAPI
- select CRYPTO_CRYPTD
- select CRYPTO_ABLK_HELPER
- select CRYPTO_GLUE_HELPER_X86
- select CRYPTO_CAST_COMMON
+ select CRYPTO_BLKCIPHER
select CRYPTO_CAST6
+ select CRYPTO_CAST_COMMON
+ select CRYPTO_GLUE_HELPER_X86
+ select CRYPTO_SIMD
select CRYPTO_XTS
help
The CAST6 encryption algorithm (synonymous with CAST-256) is