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>

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.