Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 44893bc2 编写于 作者: E Eric Biggers 提交者： Herbert Xu
浏览文件
操作

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: NEric Biggers <ebiggers@google.com>
Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
上级 1af6d037
隐藏空白更改
内联 并排
Showing with 208 addition and 443 deletion
arch/x86/crypto/camellia_aesni_avx2_glue.c
浏览文件 @ 44893bc2
...@@ -10,17 +10,15 @@ ...@@ -10,17 +10,15 @@
* *
*/ */
#include <linux/module.h>
#include <linux/types.h>
#include <linux/crypto.h>
#include <linux/err.h>
#include <crypto/ablk_helper.h>
#include <crypto/algapi.h>
#include <crypto/ctr.h>
#include <crypto/xts.h>
#include <asm/fpu/api.h>
#include <asm/crypto/camellia.h> #include <asm/crypto/camellia.h>
#include <asm/crypto/glue_helper.h> #include <asm/crypto/glue_helper.h>
#include <crypto/algapi.h>
#include <crypto/internal/simd.h>
#include <crypto/xts.h>
#include <linux/crypto.h>
#include <linux/err.h>
#include <linux/module.h>
#include <linux/types.h>
#define CAMELLIA_AESNI_PARALLEL_BLOCKS 16 #define CAMELLIA_AESNI_PARALLEL_BLOCKS 16
#define CAMELLIA_AESNI_AVX2_PARALLEL_BLOCKS 32 #define CAMELLIA_AESNI_AVX2_PARALLEL_BLOCKS 32
...@@ -149,236 +147,120 @@ static const struct common_glue_ctx camellia_dec_xts = { ...@@ -149,236 +147,120 @@ static const struct common_glue_ctx camellia_dec_xts = {
} } } }
}; };
static int ecb_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst, static int camellia_setkey(struct crypto_skcipher *tfm, const u8 *key,
struct scatterlist *src, unsigned int nbytes) unsigned int keylen)
{ {
return glue_ecb_crypt_128bit(&camellia_enc, desc, dst, src, nbytes); return __camellia_setkey(crypto_skcipher_ctx(tfm), key, keylen,
&tfm->base.crt_flags);
} }
static int ecb_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, static int ecb_encrypt(struct skcipher_request *req)
struct scatterlist *src, unsigned int nbytes)
{ {
return glue_ecb_crypt_128bit(&camellia_dec, desc, dst, src, nbytes); return glue_ecb_req_128bit(&camellia_enc, req);
} }
static int cbc_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst, static int ecb_decrypt(struct skcipher_request *req)
struct scatterlist *src, unsigned int nbytes)
{ {
return glue_cbc_encrypt_128bit(GLUE_FUNC_CAST(camellia_enc_blk), desc, return glue_ecb_req_128bit(&camellia_dec, req);
dst, src, nbytes);
} }
static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, static int cbc_encrypt(struct skcipher_request *req)
struct scatterlist *src, unsigned int nbytes)
{ {
return glue_cbc_decrypt_128bit(&camellia_dec_cbc, desc, dst, src, return glue_cbc_encrypt_req_128bit(GLUE_FUNC_CAST(camellia_enc_blk),
nbytes); req);
} }
static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst, static int cbc_decrypt(struct skcipher_request *req)
struct scatterlist *src, unsigned int nbytes)
{ {
return glue_ctr_crypt_128bit(&camellia_ctr, desc, dst, src, nbytes); return glue_cbc_decrypt_req_128bit(&camellia_dec_cbc, req);
} }
static int camellia_setkey(struct crypto_tfm *tfm, const u8 *in_key, static int ctr_crypt(struct skcipher_request *req)
unsigned int key_len)
{ {
return __camellia_setkey(crypto_tfm_ctx(tfm), in_key, key_len, return glue_ctr_req_128bit(&camellia_ctr, req);
&tfm->crt_flags);
} }
static int xts_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst, static int xts_encrypt(struct skcipher_request *req)
struct scatterlist *src, unsigned int nbytes)
{ {
struct camellia_xts_ctx *ctx = crypto_blkcipher_ctx(desc->tfm); struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
struct camellia_xts_ctx *ctx = crypto_skcipher_ctx(tfm);
return glue_xts_crypt_128bit(&camellia_enc_xts, desc, dst, src, nbytes, return glue_xts_req_128bit(&camellia_enc_xts, req,
XTS_TWEAK_CAST(camellia_enc_blk), XTS_TWEAK_CAST(camellia_enc_blk),
&ctx->tweak_ctx, &ctx->crypt_ctx); &ctx->tweak_ctx, &ctx->crypt_ctx);
} }
static int xts_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, static int xts_decrypt(struct skcipher_request *req)
struct scatterlist *src, unsigned int nbytes)
{ {
struct camellia_xts_ctx *ctx = crypto_blkcipher_ctx(desc->tfm); struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
struct camellia_xts_ctx *ctx = crypto_skcipher_ctx(tfm);
return glue_xts_crypt_128bit(&camellia_dec_xts, desc, dst, src, nbytes, return glue_xts_req_128bit(&camellia_dec_xts, req,
XTS_TWEAK_CAST(camellia_enc_blk), XTS_TWEAK_CAST(camellia_enc_blk),
&ctx->tweak_ctx, &ctx->crypt_ctx); &ctx->tweak_ctx, &ctx->crypt_ctx);
} }
static struct crypto_alg cmll_algs[] = { { static struct skcipher_alg camellia_algs[] = {
.cra_name = "__ecb-camellia-aesni-avx2", {
.cra_driver_name = "__driver-ecb-camellia-aesni-avx2", .base.cra_name = "__ecb(camellia)",
.cra_priority = 0, .base.cra_driver_name = "__ecb-camellia-aesni-avx2",
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | .base.cra_priority = 500,
CRYPTO_ALG_INTERNAL, .base.cra_flags = CRYPTO_ALG_INTERNAL,
.cra_blocksize = CAMELLIA_BLOCK_SIZE, .base.cra_blocksize = CAMELLIA_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct camellia_ctx), .base.cra_ctxsize = sizeof(struct camellia_ctx),
.cra_alignmask = 0, .base.cra_module = THIS_MODULE,
.cra_type = &crypto_blkcipher_type, .min_keysize = CAMELLIA_MIN_KEY_SIZE,
.cra_module = THIS_MODULE, .max_keysize = CAMELLIA_MAX_KEY_SIZE,
.cra_u = { .setkey = camellia_setkey,
.blkcipher = { .encrypt = ecb_encrypt,
.min_keysize = CAMELLIA_MIN_KEY_SIZE, .decrypt = ecb_decrypt,
.max_keysize = CAMELLIA_MAX_KEY_SIZE, }, {
.setkey = camellia_setkey, .base.cra_name = "__cbc(camellia)",
.encrypt = ecb_encrypt, .base.cra_driver_name = "__cbc-camellia-aesni-avx2",
.decrypt = ecb_decrypt, .base.cra_priority = 500,
}, .base.cra_flags = CRYPTO_ALG_INTERNAL,
}, .base.cra_blocksize = CAMELLIA_BLOCK_SIZE,
}, { .base.cra_ctxsize = sizeof(struct camellia_ctx),
.cra_name = "__cbc-camellia-aesni-avx2", .base.cra_module = THIS_MODULE,
.cra_driver_name = "__driver-cbc-camellia-aesni-avx2", .min_keysize = CAMELLIA_MIN_KEY_SIZE,
.cra_priority = 0, .max_keysize = CAMELLIA_MAX_KEY_SIZE,
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | .ivsize = CAMELLIA_BLOCK_SIZE,
CRYPTO_ALG_INTERNAL, .setkey = camellia_setkey,
.cra_blocksize = CAMELLIA_BLOCK_SIZE, .encrypt = cbc_encrypt,
.cra_ctxsize = sizeof(struct camellia_ctx), .decrypt = cbc_decrypt,
.cra_alignmask = 0, }, {
.cra_type = &crypto_blkcipher_type, .base.cra_name = "__ctr(camellia)",
.cra_module = THIS_MODULE, .base.cra_driver_name = "__ctr-camellia-aesni-avx2",
.cra_u = { .base.cra_priority = 500,
.blkcipher = { .base.cra_flags = CRYPTO_ALG_INTERNAL,
.min_keysize = CAMELLIA_MIN_KEY_SIZE, .base.cra_blocksize = 1,
.max_keysize = CAMELLIA_MAX_KEY_SIZE, .base.cra_ctxsize = sizeof(struct camellia_ctx),
.setkey = camellia_setkey, .base.cra_module = THIS_MODULE,
.encrypt = cbc_encrypt, .min_keysize = CAMELLIA_MIN_KEY_SIZE,
.decrypt = cbc_decrypt, .max_keysize = CAMELLIA_MAX_KEY_SIZE,
}, .ivsize = CAMELLIA_BLOCK_SIZE,
}, .chunksize = CAMELLIA_BLOCK_SIZE,
}, { .setkey = camellia_setkey,
.cra_name = "__ctr-camellia-aesni-avx2", .encrypt = ctr_crypt,
.cra_driver_name = "__driver-ctr-camellia-aesni-avx2", .decrypt = ctr_crypt,
.cra_priority = 0, }, {
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | .base.cra_name = "__xts(camellia)",
CRYPTO_ALG_INTERNAL, .base.cra_driver_name = "__xts-camellia-aesni-avx2",
.cra_blocksize = 1, .base.cra_priority = 500,
.cra_ctxsize = sizeof(struct camellia_ctx), .base.cra_flags = CRYPTO_ALG_INTERNAL,
.cra_alignmask = 0, .base.cra_blocksize = CAMELLIA_BLOCK_SIZE,
.cra_type = &crypto_blkcipher_type, .base.cra_ctxsize = sizeof(struct camellia_xts_ctx),
.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
.cra_u = { .min_keysize = 2 * CAMELLIA_MIN_KEY_SIZE,
.blkcipher = { .max_keysize = 2 * CAMELLIA_MAX_KEY_SIZE,
.min_keysize = CAMELLIA_MIN_KEY_SIZE, .ivsize = CAMELLIA_BLOCK_SIZE,
.max_keysize = CAMELLIA_MAX_KEY_SIZE, .setkey = xts_camellia_setkey,
.ivsize = CAMELLIA_BLOCK_SIZE, .encrypt = xts_encrypt,
.setkey = camellia_setkey, .decrypt = xts_decrypt,
.encrypt = ctr_crypt,
.decrypt = ctr_crypt,
},
},
}, {
.cra_name = "__xts-camellia-aesni-avx2",
.cra_driver_name = "__driver-xts-camellia-aesni-avx2",
.cra_priority = 0,
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER |
CRYPTO_ALG_INTERNAL,
.cra_blocksize = CAMELLIA_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct camellia_xts_ctx),
.cra_alignmask = 0,
.cra_type = &crypto_blkcipher_type,
.cra_module = THIS_MODULE,
.cra_u = {
.blkcipher = {
.min_keysize = CAMELLIA_MIN_KEY_SIZE * 2,
.max_keysize = CAMELLIA_MAX_KEY_SIZE * 2,
.ivsize = CAMELLIA_BLOCK_SIZE,
.setkey = xts_camellia_setkey,
.encrypt = xts_encrypt,
.decrypt = xts_decrypt,
},
},
}, {
.cra_name = "ecb(camellia)",
.cra_driver_name = "ecb-camellia-aesni-avx2",
.cra_priority = 500,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
.cra_blocksize = CAMELLIA_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct async_helper_ctx),
.cra_alignmask = 0,
.cra_type = &crypto_ablkcipher_type,
.cra_module = THIS_MODULE,
.cra_init = ablk_init,
.cra_exit = ablk_exit,
.cra_u = {
.ablkcipher = {
.min_keysize = CAMELLIA_MIN_KEY_SIZE,
.max_keysize = CAMELLIA_MAX_KEY_SIZE,
.setkey = ablk_set_key,
.encrypt = ablk_encrypt,
.decrypt = ablk_decrypt,
},
},
}, {
.cra_name = "cbc(camellia)",
.cra_driver_name = "cbc-camellia-aesni-avx2",
.cra_priority = 500,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
.cra_blocksize = CAMELLIA_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct async_helper_ctx),
.cra_alignmask = 0,
.cra_type = &crypto_ablkcipher_type,
.cra_module = THIS_MODULE,
.cra_init = ablk_init,
.cra_exit = ablk_exit,
.cra_u = {
.ablkcipher = {
.min_keysize = CAMELLIA_MIN_KEY_SIZE,
.max_keysize = CAMELLIA_MAX_KEY_SIZE,
.ivsize = CAMELLIA_BLOCK_SIZE,
.setkey = ablk_set_key,
.encrypt = __ablk_encrypt,
.decrypt = ablk_decrypt,
},
},
}, {
.cra_name = "ctr(camellia)",
.cra_driver_name = "ctr-camellia-aesni-avx2",
.cra_priority = 500,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
.cra_blocksize = 1,
.cra_ctxsize = sizeof(struct async_helper_ctx),
.cra_alignmask = 0,
.cra_type = &crypto_ablkcipher_type,
.cra_module = THIS_MODULE,
.cra_init = ablk_init,
.cra_exit = ablk_exit,
.cra_u = {
.ablkcipher = {
.min_keysize = CAMELLIA_MIN_KEY_SIZE,
.max_keysize = CAMELLIA_MAX_KEY_SIZE,
.ivsize = CAMELLIA_BLOCK_SIZE,
.setkey = ablk_set_key,
.encrypt = ablk_encrypt,
.decrypt = ablk_encrypt,
.geniv = "chainiv",
},
},
}, {
.cra_name = "xts(camellia)",
.cra_driver_name = "xts-camellia-aesni-avx2",
.cra_priority = 500,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
.cra_blocksize = CAMELLIA_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct async_helper_ctx),
.cra_alignmask = 0,
.cra_type = &crypto_ablkcipher_type,
.cra_module = THIS_MODULE,
.cra_init = ablk_init,
.cra_exit = ablk_exit,
.cra_u = {
.ablkcipher = {
.min_keysize = CAMELLIA_MIN_KEY_SIZE * 2,
.max_keysize = CAMELLIA_MAX_KEY_SIZE * 2,
.ivsize = CAMELLIA_BLOCK_SIZE,
.setkey = ablk_set_key,
.encrypt = ablk_encrypt,
.decrypt = ablk_decrypt,
},
}, },
} }; };
static struct simd_skcipher_alg *camellia_simd_algs[ARRAY_SIZE(camellia_algs)];
static int __init camellia_aesni_init(void) static int __init camellia_aesni_init(void)
{ {
...@@ -398,12 +280,15 @@ static int __init camellia_aesni_init(void) ...@@ -398,12 +280,15 @@ static int __init camellia_aesni_init(void)
return -ENODEV; return -ENODEV;
} }
return crypto_register_algs(cmll_algs, ARRAY_SIZE(cmll_algs)); return simd_register_skciphers_compat(camellia_algs,
ARRAY_SIZE(camellia_algs),
camellia_simd_algs);
} }
static void __exit camellia_aesni_fini(void) static void __exit camellia_aesni_fini(void)
{ {
crypto_unregister_algs(cmll_algs, ARRAY_SIZE(cmll_algs)); simd_unregister_skciphers(camellia_algs, ARRAY_SIZE(camellia_algs),
camellia_simd_algs);
} }
module_init(camellia_aesni_init); module_init(camellia_aesni_init);
......
arch/x86/crypto/camellia_aesni_avx_glue.c
浏览文件 @ 44893bc2
...@@ -10,17 +10,15 @@ ...@@ -10,17 +10,15 @@
* *
*/ */
#include <linux/module.h>
#include <linux/types.h>
#include <linux/crypto.h>
#include <linux/err.h>
#include <crypto/ablk_helper.h>
#include <crypto/algapi.h>
#include <crypto/ctr.h>
#include <crypto/xts.h>
#include <asm/fpu/api.h>
#include <asm/crypto/camellia.h> #include <asm/crypto/camellia.h>
#include <asm/crypto/glue_helper.h> #include <asm/crypto/glue_helper.h>
#include <crypto/algapi.h>
#include <crypto/internal/simd.h>
#include <crypto/xts.h>
#include <linux/crypto.h>
#include <linux/err.h>
#include <linux/module.h>
#include <linux/types.h>
#define CAMELLIA_AESNI_PARALLEL_BLOCKS 16 #define CAMELLIA_AESNI_PARALLEL_BLOCKS 16
...@@ -153,53 +151,47 @@ static const struct common_glue_ctx camellia_dec_xts = { ...@@ -153,53 +151,47 @@ static const struct common_glue_ctx camellia_dec_xts = {
} } } }
}; };
static int ecb_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst, static int camellia_setkey(struct crypto_skcipher *tfm, const u8 *key,
struct scatterlist *src, unsigned int nbytes) unsigned int keylen)
{ {
return glue_ecb_crypt_128bit(&camellia_enc, desc, dst, src, nbytes); return __camellia_setkey(crypto_skcipher_ctx(tfm), key, keylen,
&tfm->base.crt_flags);
} }
static int ecb_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, static int ecb_encrypt(struct skcipher_request *req)
struct scatterlist *src, unsigned int nbytes)
{ {
return glue_ecb_crypt_128bit(&camellia_dec, desc, dst, src, nbytes); return glue_ecb_req_128bit(&camellia_enc, req);
} }
static int cbc_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst, static int ecb_decrypt(struct skcipher_request *req)
struct scatterlist *src, unsigned int nbytes)
{ {
return glue_cbc_encrypt_128bit(GLUE_FUNC_CAST(camellia_enc_blk), desc, return glue_ecb_req_128bit(&camellia_dec, req);
dst, src, nbytes);
} }
static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, static int cbc_encrypt(struct skcipher_request *req)
struct scatterlist *src, unsigned int nbytes)
{ {
return glue_cbc_decrypt_128bit(&camellia_dec_cbc, desc, dst, src, return glue_cbc_encrypt_req_128bit(GLUE_FUNC_CAST(camellia_enc_blk),
nbytes); req);
} }
static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst, static int cbc_decrypt(struct skcipher_request *req)
struct scatterlist *src, unsigned int nbytes)
{ {
return glue_ctr_crypt_128bit(&camellia_ctr, desc, dst, src, nbytes); return glue_cbc_decrypt_req_128bit(&camellia_dec_cbc, req);
} }
static int camellia_setkey(struct crypto_tfm *tfm, const u8 *in_key, static int ctr_crypt(struct skcipher_request *req)
unsigned int key_len)
{ {
return __camellia_setkey(crypto_tfm_ctx(tfm), in_key, key_len, return glue_ctr_req_128bit(&camellia_ctr, req);
&tfm->crt_flags);
} }
int xts_camellia_setkey(struct crypto_tfm *tfm, const u8 *key, int xts_camellia_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int keylen) unsigned int keylen)
{ {
struct camellia_xts_ctx *ctx = crypto_tfm_ctx(tfm); struct camellia_xts_ctx *ctx = crypto_skcipher_ctx(tfm);
u32 *flags = &tfm->crt_flags; u32 *flags = &tfm->base.crt_flags;
int err; int err;
err = xts_check_key(tfm, key, keylen); err = xts_verify_key(tfm, key, keylen);
if (err) if (err)
return err; return err;
...@@ -214,197 +206,87 @@ int xts_camellia_setkey(struct crypto_tfm *tfm, const u8 *key, ...@@ -214,197 +206,87 @@ int xts_camellia_setkey(struct crypto_tfm *tfm, const u8 *key,
} }
EXPORT_SYMBOL_GPL(xts_camellia_setkey); EXPORT_SYMBOL_GPL(xts_camellia_setkey);
static int xts_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst, static int xts_encrypt(struct skcipher_request *req)
struct scatterlist *src, unsigned int nbytes)
{ {
struct camellia_xts_ctx *ctx = crypto_blkcipher_ctx(desc->tfm); struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
struct camellia_xts_ctx *ctx = crypto_skcipher_ctx(tfm);
return glue_xts_crypt_128bit(&camellia_enc_xts, desc, dst, src, nbytes, return glue_xts_req_128bit(&camellia_enc_xts, req,
XTS_TWEAK_CAST(camellia_enc_blk), XTS_TWEAK_CAST(camellia_enc_blk),
&ctx->tweak_ctx, &ctx->crypt_ctx); &ctx->tweak_ctx, &ctx->crypt_ctx);
} }
static int xts_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, static int xts_decrypt(struct skcipher_request *req)
struct scatterlist *src, unsigned int nbytes)
{ {
struct camellia_xts_ctx *ctx = crypto_blkcipher_ctx(desc->tfm); struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
struct camellia_xts_ctx *ctx = crypto_skcipher_ctx(tfm);
return glue_xts_crypt_128bit(&camellia_dec_xts, desc, dst, src, nbytes, return glue_xts_req_128bit(&camellia_dec_xts, req,
XTS_TWEAK_CAST(camellia_enc_blk), XTS_TWEAK_CAST(camellia_enc_blk),
&ctx->tweak_ctx, &ctx->crypt_ctx); &ctx->tweak_ctx, &ctx->crypt_ctx);
} }
static struct crypto_alg cmll_algs[] = { { static struct skcipher_alg camellia_algs[] = {
.cra_name = "__ecb-camellia-aesni", {
.cra_driver_name = "__driver-ecb-camellia-aesni", .base.cra_name = "__ecb(camellia)",
.cra_priority = 0, .base.cra_driver_name = "__ecb-camellia-aesni",
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | .base.cra_priority = 400,
CRYPTO_ALG_INTERNAL, .base.cra_flags = CRYPTO_ALG_INTERNAL,
.cra_blocksize = CAMELLIA_BLOCK_SIZE, .base.cra_blocksize = CAMELLIA_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct camellia_ctx), .base.cra_ctxsize = sizeof(struct camellia_ctx),
.cra_alignmask = 0, .base.cra_module = THIS_MODULE,
.cra_type = &crypto_blkcipher_type, .min_keysize = CAMELLIA_MIN_KEY_SIZE,
.cra_module = THIS_MODULE, .max_keysize = CAMELLIA_MAX_KEY_SIZE,
.cra_u = { .setkey = camellia_setkey,
.blkcipher = { .encrypt = ecb_encrypt,
.min_keysize = CAMELLIA_MIN_KEY_SIZE, .decrypt = ecb_decrypt,
.max_keysize = CAMELLIA_MAX_KEY_SIZE, }, {
.setkey = camellia_setkey, .base.cra_name = "__cbc(camellia)",
.encrypt = ecb_encrypt, .base.cra_driver_name = "__cbc-camellia-aesni",
.decrypt = ecb_decrypt, .base.cra_priority = 400,
}, .base.cra_flags = CRYPTO_ALG_INTERNAL,
}, .base.cra_blocksize = CAMELLIA_BLOCK_SIZE,
}, { .base.cra_ctxsize = sizeof(struct camellia_ctx),
.cra_name = "__cbc-camellia-aesni", .base.cra_module = THIS_MODULE,
.cra_driver_name = "__driver-cbc-camellia-aesni", .min_keysize = CAMELLIA_MIN_KEY_SIZE,
.cra_priority = 0, .max_keysize = CAMELLIA_MAX_KEY_SIZE,
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | .ivsize = CAMELLIA_BLOCK_SIZE,
CRYPTO_ALG_INTERNAL, .setkey = camellia_setkey,
.cra_blocksize = CAMELLIA_BLOCK_SIZE, .encrypt = cbc_encrypt,
.cra_ctxsize = sizeof(struct camellia_ctx), .decrypt = cbc_decrypt,
.cra_alignmask = 0, }, {
.cra_type = &crypto_blkcipher_type, .base.cra_name = "__ctr(camellia)",
.cra_module = THIS_MODULE, .base.cra_driver_name = "__ctr-camellia-aesni",
.cra_u = { .base.cra_priority = 400,
.blkcipher = { .base.cra_flags = CRYPTO_ALG_INTERNAL,
.min_keysize = CAMELLIA_MIN_KEY_SIZE, .base.cra_blocksize = 1,
.max_keysize = CAMELLIA_MAX_KEY_SIZE, .base.cra_ctxsize = sizeof(struct camellia_ctx),
.setkey = camellia_setkey, .base.cra_module = THIS_MODULE,
.encrypt = cbc_encrypt, .min_keysize = CAMELLIA_MIN_KEY_SIZE,
.decrypt = cbc_decrypt, .max_keysize = CAMELLIA_MAX_KEY_SIZE,
}, .ivsize = CAMELLIA_BLOCK_SIZE,
}, .chunksize = CAMELLIA_BLOCK_SIZE,
}, { .setkey = camellia_setkey,
.cra_name = "__ctr-camellia-aesni", .encrypt = ctr_crypt,
.cra_driver_name = "__driver-ctr-camellia-aesni", .decrypt = ctr_crypt,
.cra_priority = 0, }, {
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | .base.cra_name = "__xts(camellia)",
CRYPTO_ALG_INTERNAL, .base.cra_driver_name = "__xts-camellia-aesni",
.cra_blocksize = 1, .base.cra_priority = 400,
.cra_ctxsize = sizeof(struct camellia_ctx), .base.cra_flags = CRYPTO_ALG_INTERNAL,
.cra_alignmask = 0, .base.cra_blocksize = CAMELLIA_BLOCK_SIZE,
.cra_type = &crypto_blkcipher_type, .base.cra_ctxsize = sizeof(struct camellia_xts_ctx),
.cra_module = THIS_MODULE, .base.cra_module = THIS_MODULE,
.cra_u = { .min_keysize = 2 * CAMELLIA_MIN_KEY_SIZE,
.blkcipher = { .max_keysize = 2 * CAMELLIA_MAX_KEY_SIZE,
.min_keysize = CAMELLIA_MIN_KEY_SIZE, .ivsize = CAMELLIA_BLOCK_SIZE,
.max_keysize = CAMELLIA_MAX_KEY_SIZE, .setkey = xts_camellia_setkey,
.ivsize = CAMELLIA_BLOCK_SIZE, .encrypt = xts_encrypt,
.setkey = camellia_setkey, .decrypt = xts_decrypt,
.encrypt = ctr_crypt,
.decrypt = ctr_crypt,
},
},
}, {
.cra_name = "__xts-camellia-aesni",
.cra_driver_name = "__driver-xts-camellia-aesni",
.cra_priority = 0,
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER |
CRYPTO_ALG_INTERNAL,
.cra_blocksize = CAMELLIA_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct camellia_xts_ctx),
.cra_alignmask = 0,
.cra_type = &crypto_blkcipher_type,
.cra_module = THIS_MODULE,
.cra_u = {
.blkcipher = {
.min_keysize = CAMELLIA_MIN_KEY_SIZE * 2,
.max_keysize = CAMELLIA_MAX_KEY_SIZE * 2,
.ivsize = CAMELLIA_BLOCK_SIZE,
.setkey = xts_camellia_setkey,
.encrypt = xts_encrypt,
.decrypt = xts_decrypt,
},
},
}, {
.cra_name = "ecb(camellia)",
.cra_driver_name = "ecb-camellia-aesni",
.cra_priority = 400,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
.cra_blocksize = CAMELLIA_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct async_helper_ctx),
.cra_alignmask = 0,
.cra_type = &crypto_ablkcipher_type,
.cra_module = THIS_MODULE,
.cra_init = ablk_init,
.cra_exit = ablk_exit,
.cra_u = {
.ablkcipher = {
.min_keysize = CAMELLIA_MIN_KEY_SIZE,
.max_keysize = CAMELLIA_MAX_KEY_SIZE,
.setkey = ablk_set_key,
.encrypt = ablk_encrypt,
.decrypt = ablk_decrypt,
},
},
}, {
.cra_name = "cbc(camellia)",
.cra_driver_name = "cbc-camellia-aesni",
.cra_priority = 400,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
.cra_blocksize = CAMELLIA_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct async_helper_ctx),
.cra_alignmask = 0,
.cra_type = &crypto_ablkcipher_type,
.cra_module = THIS_MODULE,
.cra_init = ablk_init,
.cra_exit = ablk_exit,
.cra_u = {
.ablkcipher = {
.min_keysize = CAMELLIA_MIN_KEY_SIZE,
.max_keysize = CAMELLIA_MAX_KEY_SIZE,
.ivsize = CAMELLIA_BLOCK_SIZE,
.setkey = ablk_set_key,
.encrypt = __ablk_encrypt,
.decrypt = ablk_decrypt,
},
},
}, {
.cra_name = "ctr(camellia)",
.cra_driver_name = "ctr-camellia-aesni",
.cra_priority = 400,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
.cra_blocksize = 1,
.cra_ctxsize = sizeof(struct async_helper_ctx),
.cra_alignmask = 0,
.cra_type = &crypto_ablkcipher_type,
.cra_module = THIS_MODULE,
.cra_init = ablk_init,
.cra_exit = ablk_exit,
.cra_u = {
.ablkcipher = {
.min_keysize = CAMELLIA_MIN_KEY_SIZE,
.max_keysize = CAMELLIA_MAX_KEY_SIZE,
.ivsize = CAMELLIA_BLOCK_SIZE,
.setkey = ablk_set_key,
.encrypt = ablk_encrypt,
.decrypt = ablk_encrypt,
.geniv = "chainiv",
},
},
}, {
.cra_name = "xts(camellia)",
.cra_driver_name = "xts-camellia-aesni",
.cra_priority = 400,
.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
.cra_blocksize = CAMELLIA_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct async_helper_ctx),
.cra_alignmask = 0,
.cra_type = &crypto_ablkcipher_type,
.cra_module = THIS_MODULE,
.cra_init = ablk_init,
.cra_exit = ablk_exit,
.cra_u = {
.ablkcipher = {
.min_keysize = CAMELLIA_MIN_KEY_SIZE * 2,
.max_keysize = CAMELLIA_MAX_KEY_SIZE * 2,
.ivsize = CAMELLIA_BLOCK_SIZE,
.setkey = ablk_set_key,
.encrypt = ablk_encrypt,
.decrypt = ablk_decrypt,
},
}, },
} }; };
static struct simd_skcipher_alg *camellia_simd_algs[ARRAY_SIZE(camellia_algs)];
static int __init camellia_aesni_init(void) static int __init camellia_aesni_init(void)
{ {
...@@ -423,12 +305,15 @@ static int __init camellia_aesni_init(void) ...@@ -423,12 +305,15 @@ static int __init camellia_aesni_init(void)
return -ENODEV; return -ENODEV;
} }
return crypto_register_algs(cmll_algs, ARRAY_SIZE(cmll_algs)); return simd_register_skciphers_compat(camellia_algs,
ARRAY_SIZE(camellia_algs),
camellia_simd_algs);
} }
static void __exit camellia_aesni_fini(void) static void __exit camellia_aesni_fini(void)
{ {
crypto_unregister_algs(cmll_algs, ARRAY_SIZE(cmll_algs)); simd_unregister_skciphers(camellia_algs, ARRAY_SIZE(camellia_algs),
camellia_simd_algs);
} }
module_init(camellia_aesni_init); module_init(camellia_aesni_init);
......
arch/x86/include/asm/crypto/camellia.h
浏览文件 @ 44893bc2
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
#define CAMELLIA_TABLE_BYTE_LEN 272 #define CAMELLIA_TABLE_BYTE_LEN 272
#define CAMELLIA_PARALLEL_BLOCKS 2 #define CAMELLIA_PARALLEL_BLOCKS 2
struct crypto_skcipher;
struct camellia_ctx { struct camellia_ctx {
u64 key_table[CAMELLIA_TABLE_BYTE_LEN / sizeof(u64)]; u64 key_table[CAMELLIA_TABLE_BYTE_LEN / sizeof(u64)];
u32 key_length; u32 key_length;
...@@ -26,7 +28,7 @@ extern int __camellia_setkey(struct camellia_ctx *cctx, ...@@ -26,7 +28,7 @@ extern int __camellia_setkey(struct camellia_ctx *cctx,
const unsigned char *key, const unsigned char *key,
unsigned int key_len, u32 *flags); 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); unsigned int keylen);
/* regular block cipher functions */ /* regular block cipher functions */
......
crypto/Kconfig
浏览文件 @ 44893bc2
...@@ -1162,11 +1162,10 @@ config CRYPTO_CAMELLIA_AESNI_AVX_X86_64 ...@@ -1162,11 +1162,10 @@ config CRYPTO_CAMELLIA_AESNI_AVX_X86_64
tristate "Camellia cipher algorithm (x86_64/AES-NI/AVX)" tristate "Camellia cipher algorithm (x86_64/AES-NI/AVX)"
depends on X86 && 64BIT depends on X86 && 64BIT
depends on CRYPTO depends on CRYPTO
select CRYPTO_ALGAPI select CRYPTO_BLKCIPHER
select CRYPTO_CRYPTD
select CRYPTO_ABLK_HELPER
select CRYPTO_GLUE_HELPER_X86
select CRYPTO_CAMELLIA_X86_64 select CRYPTO_CAMELLIA_X86_64
select CRYPTO_GLUE_HELPER_X86
select CRYPTO_SIMD
select CRYPTO_XTS select CRYPTO_XTS
help help
Camellia cipher algorithm module (x86_64/AES-NI/AVX). Camellia cipher algorithm module (x86_64/AES-NI/AVX).
...@@ -1183,13 +1182,7 @@ config CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 ...@@ -1183,13 +1182,7 @@ config CRYPTO_CAMELLIA_AESNI_AVX2_X86_64
tristate "Camellia cipher algorithm (x86_64/AES-NI/AVX2)" tristate "Camellia cipher algorithm (x86_64/AES-NI/AVX2)"
depends on X86 && 64BIT depends on X86 && 64BIT
depends on CRYPTO 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_CAMELLIA_AESNI_AVX_X86_64
select CRYPTO_XTS
help help
Camellia cipher algorithm module (x86_64/AES-NI/AVX2). Camellia cipher algorithm module (x86_64/AES-NI/AVX2).
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或