Commit 9c1e8836 authored by Kees Cook's avatar Kees Cook Committed by Herbert Xu
Browse files

crypto: x86 - Regularize glue function prototypes 



The crypto glue performed function prototype casting via macros to make
indirect calls to assembly routines. Instead of performing casts at the
call sites (which trips Control Flow Integrity prototype checking), switch
each prototype to a common standard set of arguments which allows the
removal of the existing macros. In order to keep pointer math unchanged,
internal casting between u128 pointers and u8 pointers is added.

Co-developed-by: default avatarJoão Moreira <joao.moreira@intel.com>
Signed-off-by: default avatarJoão Moreira <joao.moreira@intel.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarEric Biggers <ebiggers@kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 7278fa25

arch/x86/crypto/aesni-intel_asm.S

+4 −4
Original line number Diff line number Diff line
@@ -1942,7 +1942,7 @@ SYM_FUNC_START(aesni_set_key) 
SYM_FUNC_END(aesni_set_key)



/*

 * void aesni_enc(struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src)

 * void aesni_enc(const void *ctx, u8 *dst, const u8 *src)

 */

SYM_FUNC_START(aesni_enc)

	FRAME_BEGIN
@@ -2131,7 +2131,7 @@ SYM_FUNC_START_LOCAL(_aesni_enc4) 
SYM_FUNC_END(_aesni_enc4)



/*

 * void aesni_dec (struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src)

 * void aesni_dec (const void *ctx, u8 *dst, const u8 *src)

 */

SYM_FUNC_START(aesni_dec)

	FRAME_BEGIN
@@ -2716,8 +2716,8 @@ SYM_FUNC_END(aesni_ctr_enc) 
	pxor CTR, IV;



/*

 * void aesni_xts_crypt8(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,

 *			 bool enc, u8 *iv)

 * void aesni_xts_crypt8(const struct crypto_aes_ctx *ctx, u8 *dst,

 *			 const u8 *src, bool enc, le128 *iv)

 */

SYM_FUNC_START(aesni_xts_crypt8)

	FRAME_BEGIN

arch/x86/crypto/aesni-intel_glue.c

+18 −27
Original line number Diff line number Diff line
@@ -83,10 +83,8 @@ struct gcm_context_data { 


asmlinkage int aesni_set_key(struct crypto_aes_ctx *ctx, const u8 *in_key,

			     unsigned int key_len);

asmlinkage void aesni_enc(struct crypto_aes_ctx *ctx, u8 *out,

			  const u8 *in);

asmlinkage void aesni_dec(struct crypto_aes_ctx *ctx, u8 *out,

			  const u8 *in);

asmlinkage void aesni_enc(const void *ctx, u8 *out, const u8 *in);

asmlinkage void aesni_dec(const void *ctx, u8 *out, const u8 *in);

asmlinkage void aesni_ecb_enc(struct crypto_aes_ctx *ctx, u8 *out,

			      const u8 *in, unsigned int len);

asmlinkage void aesni_ecb_dec(struct crypto_aes_ctx *ctx, u8 *out,
@@ -106,8 +104,8 @@ static void (*aesni_ctr_enc_tfm)(struct crypto_aes_ctx *ctx, u8 *out, 
asmlinkage void aesni_ctr_enc(struct crypto_aes_ctx *ctx, u8 *out,

			      const u8 *in, unsigned int len, u8 *iv);



asmlinkage void aesni_xts_crypt8(struct crypto_aes_ctx *ctx, u8 *out,

				 const u8 *in, bool enc, u8 *iv);

asmlinkage void aesni_xts_crypt8(const struct crypto_aes_ctx *ctx, u8 *out,

				 const u8 *in, bool enc, le128 *iv);



/* asmlinkage void aesni_gcm_enc()

 * void *ctx,  AES Key schedule. Starts on a 16 byte boundary.
@@ -550,29 +548,24 @@ static int xts_aesni_setkey(struct crypto_skcipher *tfm, const u8 *key, 
}





static void aesni_xts_tweak(void *ctx, u8 *out, const u8 *in)

static void aesni_xts_enc(const void *ctx, u8 *dst, const u8 *src, le128 *iv)

{

	aesni_enc(ctx, out, in);

	glue_xts_crypt_128bit_one(ctx, dst, src, iv, aesni_enc);

}



static void aesni_xts_enc(void *ctx, u128 *dst, const u128 *src, le128 *iv)

static void aesni_xts_dec(const void *ctx, u8 *dst, const u8 *src, le128 *iv)

{

	glue_xts_crypt_128bit_one(ctx, dst, src, iv, GLUE_FUNC_CAST(aesni_enc));

	glue_xts_crypt_128bit_one(ctx, dst, src, iv, aesni_dec);

}



static void aesni_xts_dec(void *ctx, u128 *dst, const u128 *src, le128 *iv)

static void aesni_xts_enc8(const void *ctx, u8 *dst, const u8 *src, le128 *iv)

{

	glue_xts_crypt_128bit_one(ctx, dst, src, iv, GLUE_FUNC_CAST(aesni_dec));

	aesni_xts_crypt8(ctx, dst, src, true, iv);

}



static void aesni_xts_enc8(void *ctx, u128 *dst, const u128 *src, le128 *iv)

static void aesni_xts_dec8(const void *ctx, u8 *dst, const u8 *src, le128 *iv)

{

	aesni_xts_crypt8(ctx, (u8 *)dst, (const u8 *)src, true, (u8 *)iv);

}



static void aesni_xts_dec8(void *ctx, u128 *dst, const u128 *src, le128 *iv)

{

	aesni_xts_crypt8(ctx, (u8 *)dst, (const u8 *)src, false, (u8 *)iv);

	aesni_xts_crypt8(ctx, dst, src, false, iv);

}



static const struct common_glue_ctx aesni_enc_xts = {
@@ -581,10 +574,10 @@ static const struct common_glue_ctx aesni_enc_xts = { 


	.funcs = { {

		.num_blocks = 8,

		.fn_u = { .xts = GLUE_XTS_FUNC_CAST(aesni_xts_enc8) }

		.fn_u = { .xts = aesni_xts_enc8 }

	}, {

		.num_blocks = 1,

		.fn_u = { .xts = GLUE_XTS_FUNC_CAST(aesni_xts_enc) }

		.fn_u = { .xts = aesni_xts_enc }

	} }

};
@@ -594,10 +587,10 @@ static const struct common_glue_ctx aesni_dec_xts = { 


	.funcs = { {

		.num_blocks = 8,

		.fn_u = { .xts = GLUE_XTS_FUNC_CAST(aesni_xts_dec8) }

		.fn_u = { .xts = aesni_xts_dec8 }

	}, {

		.num_blocks = 1,

		.fn_u = { .xts = GLUE_XTS_FUNC_CAST(aesni_xts_dec) }

		.fn_u = { .xts = aesni_xts_dec }

	} }

};
@@ -606,8 +599,7 @@ static int xts_encrypt(struct skcipher_request *req) 
	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);

	struct aesni_xts_ctx *ctx = crypto_skcipher_ctx(tfm);



	return glue_xts_req_128bit(&aesni_enc_xts, req,

				   XTS_TWEAK_CAST(aesni_xts_tweak),

	return glue_xts_req_128bit(&aesni_enc_xts, req, aesni_enc,

				   aes_ctx(ctx->raw_tweak_ctx),

				   aes_ctx(ctx->raw_crypt_ctx),

				   false);
@@ -618,8 +610,7 @@ static int xts_decrypt(struct skcipher_request *req) 
	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);

	struct aesni_xts_ctx *ctx = crypto_skcipher_ctx(tfm);



	return glue_xts_req_128bit(&aesni_dec_xts, req,

				   XTS_TWEAK_CAST(aesni_xts_tweak),

	return glue_xts_req_128bit(&aesni_dec_xts, req, aesni_enc,

				   aes_ctx(ctx->raw_tweak_ctx),

				   aes_ctx(ctx->raw_crypt_ctx),

				   true);

arch/x86/crypto/camellia_aesni_avx2_glue.c

+34 −40
Original line number Diff line number Diff line
@@ -19,20 +19,17 @@ 
#define CAMELLIA_AESNI_AVX2_PARALLEL_BLOCKS 32



/* 32-way AVX2/AES-NI parallel cipher functions */

asmlinkage void camellia_ecb_enc_32way(struct camellia_ctx *ctx, u8 *dst,

				       const u8 *src);

asmlinkage void camellia_ecb_dec_32way(struct camellia_ctx *ctx, u8 *dst,

				       const u8 *src);

asmlinkage void camellia_ecb_enc_32way(const void *ctx, u8 *dst, const u8 *src);

asmlinkage void camellia_ecb_dec_32way(const void *ctx, u8 *dst, const u8 *src);



asmlinkage void camellia_cbc_dec_32way(struct camellia_ctx *ctx, u8 *dst,

				       const u8 *src);

asmlinkage void camellia_ctr_32way(struct camellia_ctx *ctx, u8 *dst,

				   const u8 *src, le128 *iv);

asmlinkage void camellia_cbc_dec_32way(const void *ctx, u8 *dst, const u8 *src);

asmlinkage void camellia_ctr_32way(const void *ctx, u8 *dst, const u8 *src,

				   le128 *iv);



asmlinkage void camellia_xts_enc_32way(struct camellia_ctx *ctx, u8 *dst,

				       const u8 *src, le128 *iv);

asmlinkage void camellia_xts_dec_32way(struct camellia_ctx *ctx, u8 *dst,

				       const u8 *src, le128 *iv);

asmlinkage void camellia_xts_enc_32way(const void *ctx, u8 *dst, const u8 *src,

				       le128 *iv);

asmlinkage void camellia_xts_dec_32way(const void *ctx, u8 *dst, const u8 *src,

				       le128 *iv);



static const struct common_glue_ctx camellia_enc = {

	.num_funcs = 4,
@@ -40,16 +37,16 @@ static const struct common_glue_ctx camellia_enc = { 


	.funcs = { {

		.num_blocks = CAMELLIA_AESNI_AVX2_PARALLEL_BLOCKS,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_ecb_enc_32way) }

		.fn_u = { .ecb = camellia_ecb_enc_32way }

	}, {

		.num_blocks = CAMELLIA_AESNI_PARALLEL_BLOCKS,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_ecb_enc_16way) }

		.fn_u = { .ecb = camellia_ecb_enc_16way }

	}, {

		.num_blocks = 2,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_enc_blk_2way) }

		.fn_u = { .ecb = camellia_enc_blk_2way }

	}, {

		.num_blocks = 1,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_enc_blk) }

		.fn_u = { .ecb = camellia_enc_blk }

	} }

};
@@ -59,16 +56,16 @@ static const struct common_glue_ctx camellia_ctr = { 


	.funcs = { {

		.num_blocks = CAMELLIA_AESNI_AVX2_PARALLEL_BLOCKS,

		.fn_u = { .ctr = GLUE_CTR_FUNC_CAST(camellia_ctr_32way) }

		.fn_u = { .ctr = camellia_ctr_32way }

	}, {

		.num_blocks = CAMELLIA_AESNI_PARALLEL_BLOCKS,

		.fn_u = { .ctr = GLUE_CTR_FUNC_CAST(camellia_ctr_16way) }

		.fn_u = { .ctr = camellia_ctr_16way }

	}, {

		.num_blocks = 2,

		.fn_u = { .ctr = GLUE_CTR_FUNC_CAST(camellia_crypt_ctr_2way) }

		.fn_u = { .ctr = camellia_crypt_ctr_2way }

	}, {

		.num_blocks = 1,

		.fn_u = { .ctr = GLUE_CTR_FUNC_CAST(camellia_crypt_ctr) }

		.fn_u = { .ctr = camellia_crypt_ctr }

	} }

};
@@ -78,13 +75,13 @@ static const struct common_glue_ctx camellia_enc_xts = { 


	.funcs = { {

		.num_blocks = CAMELLIA_AESNI_AVX2_PARALLEL_BLOCKS,

		.fn_u = { .xts = GLUE_XTS_FUNC_CAST(camellia_xts_enc_32way) }

		.fn_u = { .xts = camellia_xts_enc_32way }

	}, {

		.num_blocks = CAMELLIA_AESNI_PARALLEL_BLOCKS,

		.fn_u = { .xts = GLUE_XTS_FUNC_CAST(camellia_xts_enc_16way) }

		.fn_u = { .xts = camellia_xts_enc_16way }

	}, {

		.num_blocks = 1,

		.fn_u = { .xts = GLUE_XTS_FUNC_CAST(camellia_xts_enc) }

		.fn_u = { .xts = camellia_xts_enc }

	} }

};
@@ -94,16 +91,16 @@ static const struct common_glue_ctx camellia_dec = { 


	.funcs = { {

		.num_blocks = CAMELLIA_AESNI_AVX2_PARALLEL_BLOCKS,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_ecb_dec_32way) }

		.fn_u = { .ecb = camellia_ecb_dec_32way }

	}, {

		.num_blocks = CAMELLIA_AESNI_PARALLEL_BLOCKS,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_ecb_dec_16way) }

		.fn_u = { .ecb = camellia_ecb_dec_16way }

	}, {

		.num_blocks = 2,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_dec_blk_2way) }

		.fn_u = { .ecb = camellia_dec_blk_2way }

	}, {

		.num_blocks = 1,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_dec_blk) }

		.fn_u = { .ecb = camellia_dec_blk }

	} }

};
@@ -113,16 +110,16 @@ static const struct common_glue_ctx camellia_dec_cbc = { 


	.funcs = { {

		.num_blocks = CAMELLIA_AESNI_AVX2_PARALLEL_BLOCKS,

		.fn_u = { .cbc = GLUE_CBC_FUNC_CAST(camellia_cbc_dec_32way) }

		.fn_u = { .cbc = camellia_cbc_dec_32way }

	}, {

		.num_blocks = CAMELLIA_AESNI_PARALLEL_BLOCKS,

		.fn_u = { .cbc = GLUE_CBC_FUNC_CAST(camellia_cbc_dec_16way) }

		.fn_u = { .cbc = camellia_cbc_dec_16way }

	}, {

		.num_blocks = 2,

		.fn_u = { .cbc = GLUE_CBC_FUNC_CAST(camellia_decrypt_cbc_2way) }

		.fn_u = { .cbc = camellia_decrypt_cbc_2way }

	}, {

		.num_blocks = 1,

		.fn_u = { .cbc = GLUE_CBC_FUNC_CAST(camellia_dec_blk) }

		.fn_u = { .cbc = camellia_dec_blk }

	} }

};
@@ -132,13 +129,13 @@ static const struct common_glue_ctx camellia_dec_xts = { 


	.funcs = { {

		.num_blocks = CAMELLIA_AESNI_AVX2_PARALLEL_BLOCKS,

		.fn_u = { .xts = GLUE_XTS_FUNC_CAST(camellia_xts_dec_32way) }

		.fn_u = { .xts = camellia_xts_dec_32way }

	}, {

		.num_blocks = CAMELLIA_AESNI_PARALLEL_BLOCKS,

		.fn_u = { .xts = GLUE_XTS_FUNC_CAST(camellia_xts_dec_16way) }

		.fn_u = { .xts = camellia_xts_dec_16way }

	}, {

		.num_blocks = 1,

		.fn_u = { .xts = GLUE_XTS_FUNC_CAST(camellia_xts_dec) }

		.fn_u = { .xts = camellia_xts_dec }

	} }

};
@@ -161,8 +158,7 @@ static int ecb_decrypt(struct skcipher_request *req) 


static int cbc_encrypt(struct skcipher_request *req)

{

	return glue_cbc_encrypt_req_128bit(GLUE_FUNC_CAST(camellia_enc_blk),

					   req);

	return glue_cbc_encrypt_req_128bit(camellia_enc_blk, req);

}



static int cbc_decrypt(struct skcipher_request *req)
@@ -180,8 +176,7 @@ static int xts_encrypt(struct skcipher_request *req) 
	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);

	struct camellia_xts_ctx *ctx = crypto_skcipher_ctx(tfm);



	return glue_xts_req_128bit(&camellia_enc_xts, req,

				   XTS_TWEAK_CAST(camellia_enc_blk),

	return glue_xts_req_128bit(&camellia_enc_xts, req, camellia_enc_blk,

				   &ctx->tweak_ctx, &ctx->crypt_ctx, false);

}
@@ -190,8 +185,7 @@ static int xts_decrypt(struct skcipher_request *req) 
	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);

	struct camellia_xts_ctx *ctx = crypto_skcipher_ctx(tfm);



	return glue_xts_req_128bit(&camellia_dec_xts, req,

				   XTS_TWEAK_CAST(camellia_enc_blk),

	return glue_xts_req_128bit(&camellia_dec_xts, req, camellia_enc_blk,

				   &ctx->tweak_ctx, &ctx->crypt_ctx, true);

}

arch/x86/crypto/camellia_aesni_avx_glue.c

+32 −40
Original line number Diff line number Diff line
@@ -18,41 +18,36 @@ 
#define CAMELLIA_AESNI_PARALLEL_BLOCKS 16



/* 16-way parallel cipher functions (avx/aes-ni) */

asmlinkage void camellia_ecb_enc_16way(struct camellia_ctx *ctx, u8 *dst,

				       const u8 *src);

asmlinkage void camellia_ecb_enc_16way(const void *ctx, u8 *dst, const u8 *src);

EXPORT_SYMBOL_GPL(camellia_ecb_enc_16way);



asmlinkage void camellia_ecb_dec_16way(struct camellia_ctx *ctx, u8 *dst,

				       const u8 *src);

asmlinkage void camellia_ecb_dec_16way(const void *ctx, u8 *dst, const u8 *src);

EXPORT_SYMBOL_GPL(camellia_ecb_dec_16way);



asmlinkage void camellia_cbc_dec_16way(struct camellia_ctx *ctx, u8 *dst,

				       const u8 *src);

asmlinkage void camellia_cbc_dec_16way(const void *ctx, u8 *dst, const u8 *src);

EXPORT_SYMBOL_GPL(camellia_cbc_dec_16way);



asmlinkage void camellia_ctr_16way(struct camellia_ctx *ctx, u8 *dst,

				   const u8 *src, le128 *iv);

asmlinkage void camellia_ctr_16way(const void *ctx, u8 *dst, const u8 *src,

				   le128 *iv);

EXPORT_SYMBOL_GPL(camellia_ctr_16way);



asmlinkage void camellia_xts_enc_16way(struct camellia_ctx *ctx, u8 *dst,

				       const u8 *src, le128 *iv);

asmlinkage void camellia_xts_enc_16way(const void *ctx, u8 *dst, const u8 *src,

				       le128 *iv);

EXPORT_SYMBOL_GPL(camellia_xts_enc_16way);



asmlinkage void camellia_xts_dec_16way(struct camellia_ctx *ctx, u8 *dst,

				       const u8 *src, le128 *iv);

asmlinkage void camellia_xts_dec_16way(const void *ctx, u8 *dst, const u8 *src,

				       le128 *iv);

EXPORT_SYMBOL_GPL(camellia_xts_dec_16way);



void camellia_xts_enc(void *ctx, u128 *dst, const u128 *src, le128 *iv)

void camellia_xts_enc(const void *ctx, u8 *dst, const u8 *src, le128 *iv)

{

	glue_xts_crypt_128bit_one(ctx, dst, src, iv,

				  GLUE_FUNC_CAST(camellia_enc_blk));

	glue_xts_crypt_128bit_one(ctx, dst, src, iv, camellia_enc_blk);

}

EXPORT_SYMBOL_GPL(camellia_xts_enc);



void camellia_xts_dec(void *ctx, u128 *dst, const u128 *src, le128 *iv)

void camellia_xts_dec(const void *ctx, u8 *dst, const u8 *src, le128 *iv)

{

	glue_xts_crypt_128bit_one(ctx, dst, src, iv,

				  GLUE_FUNC_CAST(camellia_dec_blk));

	glue_xts_crypt_128bit_one(ctx, dst, src, iv, camellia_dec_blk);

}

EXPORT_SYMBOL_GPL(camellia_xts_dec);
@@ -62,13 +57,13 @@ static const struct common_glue_ctx camellia_enc = { 


	.funcs = { {

		.num_blocks = CAMELLIA_AESNI_PARALLEL_BLOCKS,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_ecb_enc_16way) }

		.fn_u = { .ecb = camellia_ecb_enc_16way }

	}, {

		.num_blocks = 2,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_enc_blk_2way) }

		.fn_u = { .ecb = camellia_enc_blk_2way }

	}, {

		.num_blocks = 1,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_enc_blk) }

		.fn_u = { .ecb = camellia_enc_blk }

	} }

};
@@ -78,13 +73,13 @@ static const struct common_glue_ctx camellia_ctr = { 


	.funcs = { {

		.num_blocks = CAMELLIA_AESNI_PARALLEL_BLOCKS,

		.fn_u = { .ctr = GLUE_CTR_FUNC_CAST(camellia_ctr_16way) }

		.fn_u = { .ctr = camellia_ctr_16way }

	}, {

		.num_blocks = 2,

		.fn_u = { .ctr = GLUE_CTR_FUNC_CAST(camellia_crypt_ctr_2way) }

		.fn_u = { .ctr = camellia_crypt_ctr_2way }

	}, {

		.num_blocks = 1,

		.fn_u = { .ctr = GLUE_CTR_FUNC_CAST(camellia_crypt_ctr) }

		.fn_u = { .ctr = camellia_crypt_ctr }

	} }

};
@@ -94,10 +89,10 @@ static const struct common_glue_ctx camellia_enc_xts = { 


	.funcs = { {

		.num_blocks = CAMELLIA_AESNI_PARALLEL_BLOCKS,

		.fn_u = { .xts = GLUE_XTS_FUNC_CAST(camellia_xts_enc_16way) }

		.fn_u = { .xts = camellia_xts_enc_16way }

	}, {

		.num_blocks = 1,

		.fn_u = { .xts = GLUE_XTS_FUNC_CAST(camellia_xts_enc) }

		.fn_u = { .xts = camellia_xts_enc }

	} }

};
@@ -107,13 +102,13 @@ static const struct common_glue_ctx camellia_dec = { 


	.funcs = { {

		.num_blocks = CAMELLIA_AESNI_PARALLEL_BLOCKS,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_ecb_dec_16way) }

		.fn_u = { .ecb = camellia_ecb_dec_16way }

	}, {

		.num_blocks = 2,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_dec_blk_2way) }

		.fn_u = { .ecb = camellia_dec_blk_2way }

	}, {

		.num_blocks = 1,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_dec_blk) }

		.fn_u = { .ecb = camellia_dec_blk }

	} }

};
@@ -123,13 +118,13 @@ static const struct common_glue_ctx camellia_dec_cbc = { 


	.funcs = { {

		.num_blocks = CAMELLIA_AESNI_PARALLEL_BLOCKS,

		.fn_u = { .cbc = GLUE_CBC_FUNC_CAST(camellia_cbc_dec_16way) }

		.fn_u = { .cbc = camellia_cbc_dec_16way }

	}, {

		.num_blocks = 2,

		.fn_u = { .cbc = GLUE_CBC_FUNC_CAST(camellia_decrypt_cbc_2way) }

		.fn_u = { .cbc = camellia_decrypt_cbc_2way }

	}, {

		.num_blocks = 1,

		.fn_u = { .cbc = GLUE_CBC_FUNC_CAST(camellia_dec_blk) }

		.fn_u = { .cbc = camellia_dec_blk }

	} }

};
@@ -139,10 +134,10 @@ static const struct common_glue_ctx camellia_dec_xts = { 


	.funcs = { {

		.num_blocks = CAMELLIA_AESNI_PARALLEL_BLOCKS,

		.fn_u = { .xts = GLUE_XTS_FUNC_CAST(camellia_xts_dec_16way) }

		.fn_u = { .xts = camellia_xts_dec_16way }

	}, {

		.num_blocks = 1,

		.fn_u = { .xts = GLUE_XTS_FUNC_CAST(camellia_xts_dec) }

		.fn_u = { .xts = camellia_xts_dec }

	} }

};
@@ -165,8 +160,7 @@ static int ecb_decrypt(struct skcipher_request *req) 


static int cbc_encrypt(struct skcipher_request *req)

{

	return glue_cbc_encrypt_req_128bit(GLUE_FUNC_CAST(camellia_enc_blk),

					   req);

	return glue_cbc_encrypt_req_128bit(camellia_enc_blk, req);

}



static int cbc_decrypt(struct skcipher_request *req)
@@ -206,8 +200,7 @@ static int xts_encrypt(struct skcipher_request *req) 
	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);

	struct camellia_xts_ctx *ctx = crypto_skcipher_ctx(tfm);



	return glue_xts_req_128bit(&camellia_enc_xts, req,

				   XTS_TWEAK_CAST(camellia_enc_blk),

	return glue_xts_req_128bit(&camellia_enc_xts, req, camellia_enc_blk,

				   &ctx->tweak_ctx, &ctx->crypt_ctx, false);

}
@@ -216,8 +209,7 @@ static int xts_decrypt(struct skcipher_request *req) 
	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);

	struct camellia_xts_ctx *ctx = crypto_skcipher_ctx(tfm);



	return glue_xts_req_128bit(&camellia_dec_xts, req,

				   XTS_TWEAK_CAST(camellia_enc_blk),

	return glue_xts_req_128bit(&camellia_dec_xts, req, camellia_enc_blk,

				   &ctx->tweak_ctx, &ctx->crypt_ctx, true);

}

arch/x86/crypto/camellia_glue.c

+24 −21
Original line number Diff line number Diff line
@@ -18,19 +18,17 @@ 
#include <asm/crypto/glue_helper.h>



/* regular block cipher functions */

asmlinkage void __camellia_enc_blk(struct camellia_ctx *ctx, u8 *dst,

				   const u8 *src, bool xor);

asmlinkage void __camellia_enc_blk(const void *ctx, u8 *dst, const u8 *src,

				   bool xor);

EXPORT_SYMBOL_GPL(__camellia_enc_blk);

asmlinkage void camellia_dec_blk(struct camellia_ctx *ctx, u8 *dst,

				 const u8 *src);

asmlinkage void camellia_dec_blk(const void *ctx, u8 *dst, const u8 *src);

EXPORT_SYMBOL_GPL(camellia_dec_blk);



/* 2-way parallel cipher functions */

asmlinkage void __camellia_enc_blk_2way(struct camellia_ctx *ctx, u8 *dst,

					const u8 *src, bool xor);

asmlinkage void __camellia_enc_blk_2way(const void *ctx, u8 *dst, const u8 *src,

					bool xor);

EXPORT_SYMBOL_GPL(__camellia_enc_blk_2way);

asmlinkage void camellia_dec_blk_2way(struct camellia_ctx *ctx, u8 *dst,

				      const u8 *src);

asmlinkage void camellia_dec_blk_2way(const void *ctx, u8 *dst, const u8 *src);

EXPORT_SYMBOL_GPL(camellia_dec_blk_2way);



static void camellia_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
@@ -1267,8 +1265,10 @@ static int camellia_setkey_skcipher(struct crypto_skcipher *tfm, const u8 *key, 
	return camellia_setkey(&tfm->base, key, key_len);

}



void camellia_decrypt_cbc_2way(void *ctx, u128 *dst, const u128 *src)

void camellia_decrypt_cbc_2way(const void *ctx, u8 *d, const u8 *s)

{

	u128 *dst = (u128 *)d;

	const u128 *src = (const u128 *)s;

	u128 iv = *src;



	camellia_dec_blk_2way(ctx, (u8 *)dst, (u8 *)src);
@@ -1277,9 +1277,11 @@ void camellia_decrypt_cbc_2way(void *ctx, u128 *dst, const u128 *src) 
}

EXPORT_SYMBOL_GPL(camellia_decrypt_cbc_2way);



void camellia_crypt_ctr(void *ctx, u128 *dst, const u128 *src, le128 *iv)

void camellia_crypt_ctr(const void *ctx, u8 *d, const u8 *s, le128 *iv)

{

	be128 ctrblk;

	u128 *dst = (u128 *)d;

	const u128 *src = (const u128 *)s;



	if (dst != src)

		*dst = *src;
@@ -1291,9 +1293,11 @@ void camellia_crypt_ctr(void *ctx, u128 *dst, const u128 *src, le128 *iv) 
}

EXPORT_SYMBOL_GPL(camellia_crypt_ctr);



void camellia_crypt_ctr_2way(void *ctx, u128 *dst, const u128 *src, le128 *iv)

void camellia_crypt_ctr_2way(const void *ctx, u8 *d, const u8 *s, le128 *iv)

{

	be128 ctrblks[2];

	u128 *dst = (u128 *)d;

	const u128 *src = (const u128 *)s;



	if (dst != src) {

		dst[0] = src[0];
@@ -1315,10 +1319,10 @@ static const struct common_glue_ctx camellia_enc = { 


	.funcs = { {

		.num_blocks = 2,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_enc_blk_2way) }

		.fn_u = { .ecb = camellia_enc_blk_2way }

	}, {

		.num_blocks = 1,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_enc_blk) }

		.fn_u = { .ecb = camellia_enc_blk }

	} }

};
@@ -1328,10 +1332,10 @@ static const struct common_glue_ctx camellia_ctr = { 


	.funcs = { {

		.num_blocks = 2,

		.fn_u = { .ctr = GLUE_CTR_FUNC_CAST(camellia_crypt_ctr_2way) }

		.fn_u = { .ctr = camellia_crypt_ctr_2way }

	}, {

		.num_blocks = 1,

		.fn_u = { .ctr = GLUE_CTR_FUNC_CAST(camellia_crypt_ctr) }

		.fn_u = { .ctr = camellia_crypt_ctr }

	} }

};
@@ -1341,10 +1345,10 @@ static const struct common_glue_ctx camellia_dec = { 


	.funcs = { {

		.num_blocks = 2,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_dec_blk_2way) }

		.fn_u = { .ecb = camellia_dec_blk_2way }

	}, {

		.num_blocks = 1,

		.fn_u = { .ecb = GLUE_FUNC_CAST(camellia_dec_blk) }

		.fn_u = { .ecb = camellia_dec_blk }

	} }

};
@@ -1354,10 +1358,10 @@ static const struct common_glue_ctx camellia_dec_cbc = { 


	.funcs = { {

		.num_blocks = 2,

		.fn_u = { .cbc = GLUE_CBC_FUNC_CAST(camellia_decrypt_cbc_2way) }

		.fn_u = { .cbc = camellia_decrypt_cbc_2way }

	}, {

		.num_blocks = 1,

		.fn_u = { .cbc = GLUE_CBC_FUNC_CAST(camellia_dec_blk) }

		.fn_u = { .cbc = camellia_dec_blk }

	} }

};
@@ -1373,8 +1377,7 @@ static int ecb_decrypt(struct skcipher_request *req) 


static int cbc_encrypt(struct skcipher_request *req)

{

	return glue_cbc_encrypt_req_128bit(GLUE_FUNC_CAST(camellia_enc_blk),

					   req);

	return glue_cbc_encrypt_req_128bit(camellia_enc_blk, req);

}



static int cbc_decrypt(struct skcipher_request *req)

CRA Git | Maintained and supported by SUSTech CRA and CCSE