summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2018-02-20 08:48:06 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2018-03-02 17:03:22 +0100
commite16bf974b3d965edc9bd76fc645c3ee2c40c33b8 (patch)
tree0315b944d5c2e27a6000463efff1e597cd88bc72 /crypto
parentcrypto: x86/serpent-avx - remove LRW algorithm (diff)
downloadlinux-e16bf974b3d965edc9bd76fc645c3ee2c40c33b8.tar.xz
linux-e16bf974b3d965edc9bd76fc645c3ee2c40c33b8.zip
crypto: x86/serpent-avx,avx2 - convert to skcipher interface
Convert the AVX and AVX2 implementations of Serpent 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/Kconfig11
1 files changed, 2 insertions, 9 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 65012ebec0ab..cca8271d8894 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1460,11 +1460,10 @@ config CRYPTO_SERPENT_SSE2_586
config CRYPTO_SERPENT_AVX_X86_64
tristate "Serpent cipher algorithm (x86_64/AVX)"
depends on X86 && 64BIT
- select CRYPTO_ALGAPI
- select CRYPTO_CRYPTD
- select CRYPTO_ABLK_HELPER
+ select CRYPTO_BLKCIPHER
select CRYPTO_GLUE_HELPER_X86
select CRYPTO_SERPENT
+ select CRYPTO_SIMD
select CRYPTO_XTS
help
Serpent cipher algorithm, by Anderson, Biham & Knudsen.
@@ -1481,13 +1480,7 @@ config CRYPTO_SERPENT_AVX_X86_64
config CRYPTO_SERPENT_AVX2_X86_64
tristate "Serpent cipher algorithm (x86_64/AVX2)"
depends on X86 && 64BIT
- select CRYPTO_ALGAPI
- select CRYPTO_CRYPTD
- select CRYPTO_ABLK_HELPER
- select CRYPTO_GLUE_HELPER_X86
- select CRYPTO_SERPENT
select CRYPTO_SERPENT_AVX_X86_64
- select CRYPTO_XTS
help
Serpent cipher algorithm, by Anderson, Biham & Knudsen.