Commit 2caf3680 authored by Qi Tao's avatar Qi Tao Committed by JangShui Yang
Browse files

crypto: hisilicon/sec2 - modify nested macro call 

maillist inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I925L9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev.git/commit/?id=c4af422545474a0dbae1b17d306ec94e32ee0551



----------------------------------------------------------------------

Nested macros are integrated into a single macro,
making the code simpler.

Signed-off-by: default avatarQi Tao <taoqi10@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarJangShui Yang <yangjiangshui@h-partners.com>
parent 7c43ad97

drivers/crypto/hisilicon/sec2/sec_crypto.c

+4 −9
Original line number Diff line number Diff line
@@ -2145,8 +2145,8 @@ static int sec_skcipher_decrypt(struct skcipher_request *sk_req) 
	return sec_skcipher_crypto(sk_req, false);

}



#define SEC_SKCIPHER_GEN_ALG(sec_cra_name, sec_set_key, sec_min_key_size, \

	sec_max_key_size, ctx_init, ctx_exit, blk_size, iv_size)\

#define SEC_SKCIPHER_ALG(sec_cra_name, sec_set_key, \

	sec_min_key_size, sec_max_key_size, blk_size, iv_size)\

{\

	.base = {\

		.cra_name = sec_cra_name,\
@@ -2158,8 +2158,8 @@ static int sec_skcipher_decrypt(struct skcipher_request *sk_req) 
		.cra_ctxsize = sizeof(struct sec_ctx),\

		.cra_module = THIS_MODULE,\

	},\

	.init = ctx_init,\

	.exit = ctx_exit,\

	.init = sec_skcipher_ctx_init,\

	.exit = sec_skcipher_ctx_exit,\

	.setkey = sec_set_key,\

	.decrypt = sec_skcipher_decrypt,\

	.encrypt = sec_skcipher_encrypt,\
@@ -2168,11 +2168,6 @@ static int sec_skcipher_decrypt(struct skcipher_request *sk_req) 
	.ivsize = iv_size,\

}



#define SEC_SKCIPHER_ALG(name, key_func, min_key_size, \

	max_key_size, blk_size, iv_size) \

	SEC_SKCIPHER_GEN_ALG(name, key_func, min_key_size, max_key_size, \

	sec_skcipher_ctx_init, sec_skcipher_ctx_exit, blk_size, iv_size)



static struct sec_skcipher sec_skciphers[] = {

	{

		.alg_msk = BIT(0),