Commit 5a1348bc authored by Kai Ye's avatar Kai Ye Committed by Zheng Zengkai
Browse files

crypto: hisilicon/sec - fixup 3des minimum key size declaration 

mainline inclusion
from mainline-master
commit 6161f40c
category: bugfix
bugzilla: 173981
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6161f40c630bd7ced5f236cd5fbabec06e47afae



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

Fixup the 3des algorithm  minimum key size declaration.

Signed-off-by: default avatarKai Ye <yekai13@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarMingqiang Ling <lingmingqiang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 888b654c

drivers/crypto/hisilicon/sec2/sec_crypto.c

+2 −2
Original line number Diff line number Diff line
@@ -1861,11 +1861,11 @@ static struct skcipher_alg sec_skciphers[] = { 
			 AES_BLOCK_SIZE, AES_BLOCK_SIZE)



	SEC_SKCIPHER_ALG("ecb(des3_ede)", sec_setkey_3des_ecb,

			 SEC_DES3_2KEY_SIZE, SEC_DES3_3KEY_SIZE,

			 SEC_DES3_3KEY_SIZE, SEC_DES3_3KEY_SIZE,

			 DES3_EDE_BLOCK_SIZE, 0)



	SEC_SKCIPHER_ALG("cbc(des3_ede)", sec_setkey_3des_cbc,

			 SEC_DES3_2KEY_SIZE, SEC_DES3_3KEY_SIZE,

			 SEC_DES3_3KEY_SIZE, SEC_DES3_3KEY_SIZE,

			 DES3_EDE_BLOCK_SIZE, DES3_EDE_BLOCK_SIZE)



	SEC_SKCIPHER_ALG("xts(sm4)", sec_setkey_sm4_xts,