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 /arch/x86/include | |
| parent | 1af6d03710126392e7333417fcaf2427bfc8f169 (diff) | |
| download | op-kernel-dev-44893bc2962363417ff9bed7876e0e58741e4f76.zip op-kernel-dev-44893bc2962363417ff9bed7876e0e58741e4f76.tar.gz | |
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 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/crypto/camellia.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/include/asm/crypto/camellia.h b/arch/x86/include/asm/crypto/camellia.h index 28080cc..a5d86fc 100644 --- a/arch/x86/include/asm/crypto/camellia.h +++ b/arch/x86/include/asm/crypto/camellia.h @@ -12,6 +12,8 @@ #define CAMELLIA_TABLE_BYTE_LEN 272 #define CAMELLIA_PARALLEL_BLOCKS 2 +struct crypto_skcipher; + struct camellia_ctx { u64 key_table[CAMELLIA_TABLE_BYTE_LEN / sizeof(u64)]; u32 key_length; @@ -26,7 +28,7 @@ extern int __camellia_setkey(struct camellia_ctx *cctx, const unsigned char *key, unsigned int key_len, u32 *flags); -extern int xts_camellia_setkey(struct crypto_tfm *tfm, const u8 *key, +extern int xts_camellia_setkey(struct crypto_skcipher *tfm, const u8 *key, unsigned int keylen); /* regular block cipher functions */ |
