Re: [PATCH V2] crypto: talitos - fix ECB and CBC algs ivsize

Le 11/06/2020 à 13:50, Su Kang Yin a écrit :

commit e1de42fdfc6a ("crypto: talitos - fix ECB algs ivsize") wrongly modified CBC algs ivsize instead of ECB aggs ivsize.

This restore the CBC algs original ivsize of removes ECB's ones.

Fixes: e1de42fdfc6a ("crypto: talitos - fix ECB algs ivsize") Signed-off-by: Su Kang Yin cantona@cantona.net

Reviewed-by: Christophe Leroy christophe.leroy@csgroup.eu

---

Patch for 4.9 upstream.

drivers/crypto/talitos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index 8b383d3d21c2..059c2d4ad18f 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -2631,17 +2631,16 @@ static struct talitos_alg_template driver_algs[] = { .cra_name = "ecb(aes)", .cra_driver_name = "ecb-aes-talitos", .cra_blocksize = AES_BLOCK_SIZE, .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .cra_ablkcipher = { .min_keysize = AES_MIN_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE,

• 		.ivsize = AES_BLOCK_SIZE,
  }
  

  }, .desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | DESC_HDR_SEL0_AESU, }, { .type = CRYPTO_ALG_TYPE_ABLKCIPHER, .alg.crypto = { .cra_name = "cbc(aes)",

@@ -2665,16 +2664,17 @@ static struct talitos_alg_template driver_algs[] = { .cra_name = "ctr(aes)", .cra_driver_name = "ctr-aes-talitos", .cra_blocksize = 1, .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC, .cra_ablkcipher = { .min_keysize = AES_MIN_KEY_SIZE, .max_keysize = AES_MAX_KEY_SIZE,

• 		.ivsize = AES_BLOCK_SIZE,
  	.setkey = ablkcipher_aes_setkey,
  }
  

  }, .desc_hdr_template = DESC_HDR_TYPE_AESU_CTR_NONSNOOP | DESC_HDR_SEL0_AESU | DESC_HDR_MODE0_AESU_CTR, }, { .type = CRYPTO_ALG_TYPE_ABLKCIPHER,