summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/crypto
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2018-02-20 10:48:20 +0300
committerHerbert Xu <herbert@gondor.apana.org.au>2018-03-02 19:03:31 +0300
commit6043d341f0b57034ec92e26d353ccb450563d18e (patch)
tree90242dd815deac8d04774a35480f0d10096d0ca3 /arch/x86/include/asm/crypto
parent44c9b75409819707a94b377e69ff7948928e4b1b (diff)
downloadlinux-6043d341f0b57034ec92e26d353ccb450563d18e.tar.xz
crypto: x86/camellia - remove LRW algorithm
The LRW template now wraps an ECB mode algorithm rather than the block cipher directly. Therefore it is now redundant for crypto modules to wrap their ECB code with generic LRW code themselves via lrw_crypt(). Remove the lrw-camellia-asm algorithm which did this. Users who request lrw(camellia) and previously would have gotten lrw-camellia-asm will now get lrw(ecb-camellia-asm) instead, which is just as fast. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/x86/include/asm/crypto')
-rw-r--r--arch/x86/include/asm/crypto/camellia.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/x86/include/asm/crypto/camellia.h b/arch/x86/include/asm/crypto/camellia.h
index 24eff92a5356..08d71444edc2 100644
--- a/arch/x86/include/asm/crypto/camellia.h
+++ b/arch/x86/include/asm/crypto/camellia.h
@@ -2,7 +2,6 @@
#ifndef ASM_X86_CAMELLIA_H
#define ASM_X86_CAMELLIA_H
-#include <crypto/lrw.h>
#include <linux/kernel.h>
#include <linux/crypto.h>
@@ -17,11 +16,6 @@ struct camellia_ctx {
u32 key_length;
};
-struct camellia_lrw_ctx {
- struct lrw_table_ctx lrw_table;
- struct camellia_ctx camellia_ctx;
-};
-
struct camellia_xts_ctx {
struct camellia_ctx tweak_ctx;
struct camellia_ctx crypt_ctx;
@@ -31,10 +25,6 @@ extern int __camellia_setkey(struct camellia_ctx *cctx,
const unsigned char *key,
unsigned int key_len, u32 *flags);
-extern int lrw_camellia_setkey(struct crypto_tfm *tfm, const u8 *key,
- unsigned int keylen);
-extern void lrw_camellia_exit_tfm(struct crypto_tfm *tfm);
-
extern int xts_camellia_setkey(struct crypto_tfm *tfm, const u8 *key,
unsigned int keylen);