diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-02-19 23:48:23 -0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-03-03 00:03:32 +0800 |
| commit | 44893bc2962363417ff9bed7876e0e58741e4f76 (patch) | |
| tree | 4a9af9a0a430becd1dc9513716b57a12a1ec425c /crypto | |
| parent | 1af6d03710126392e7333417fcaf2427bfc8f169 (diff) | |
| download | linux-0-day-44893bc2962363417ff9bed7876e0e58741e4f76.tar.gz linux-0-day-44893bc2962363417ff9bed7876e0e58741e4f76.tar.xz | |
crypto: x86/camellia-aesni-avx, avx2 - convert to skcipher interface
Convert the AESNI AVX and AESNI AVX2 implementations of Camellia 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 | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 7227c20a9ba58..8783dcf20fc3c 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -1162,11 +1162,10 @@ config CRYPTO_CAMELLIA_AESNI_AVX_X86_64 tristate "Camellia cipher algorithm (x86_64/AES-NI/AVX)" depends on X86 && 64BIT depends on CRYPTO - select CRYPTO_ALGAPI - select CRYPTO_CRYPTD - select CRYPTO_ABLK_HELPER - select CRYPTO_GLUE_HELPER_X86 + select CRYPTO_BLKCIPHER select CRYPTO_CAMELLIA_X86_64 + select CRYPTO_GLUE_HELPER_X86 + select CRYPTO_SIMD select CRYPTO_XTS help Camellia cipher algorithm module (x86_64/AES-NI/AVX). @@ -1183,13 +1182,7 @@ config CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 tristate "Camellia cipher algorithm (x86_64/AES-NI/AVX2)" depends on X86 && 64BIT depends on CRYPTO - select CRYPTO_ALGAPI - select CRYPTO_CRYPTD - select CRYPTO_ABLK_HELPER - select CRYPTO_GLUE_HELPER_X86 - select CRYPTO_CAMELLIA_X86_64 select CRYPTO_CAMELLIA_AESNI_AVX_X86_64 - select CRYPTO_XTS help Camellia cipher algorithm module (x86_64/AES-NI/AVX2). |