diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-02-19 23:48:06 -0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-03-03 00:03:22 +0800 |
| commit | e16bf974b3d965edc9bd76fc645c3ee2c40c33b8 (patch) | |
| tree | 0315b944d5c2e27a6000463efff1e597cd88bc72 /crypto | |
| parent | 340b83032634c37f10626be7388052583a9a4d95 (diff) | |
| download | linux-e16bf974b3d965edc9bd76fc645c3ee2c40c33b8.tar.gz linux-e16bf974b3d965edc9bd76fc645c3ee2c40c33b8.tar.bz2 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/Kconfig | 11 |
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. |