crypto: caam/jr - fix Chacha20 + Poly1305 self test failure
[ Upstream commit a8d3cdcc092fb2f2882acb6c20473a1be0ef4484 ]
key buffer is not copied in chachapoly_setkey function,
results in wrong output for encryption/decryption operation.
fix this by memcpy the key in caam_ctx key arrary
Fixes: d6bbd4eea2
("crypto: caam/jr - add support for Chacha20 + Poly1305")
Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Родитель
61f25d4686
Коммит
62df66b726
|
@ -566,7 +566,8 @@ static int chachapoly_setkey(struct crypto_aead *aead, const u8 *key,
|
||||||
if (keylen != CHACHA_KEY_SIZE + saltlen)
|
if (keylen != CHACHA_KEY_SIZE + saltlen)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
ctx->cdata.key_virt = key;
|
memcpy(ctx->key, key, keylen);
|
||||||
|
ctx->cdata.key_virt = ctx->key;
|
||||||
ctx->cdata.keylen = keylen - saltlen;
|
ctx->cdata.keylen = keylen - saltlen;
|
||||||
|
|
||||||
return chachapoly_set_sh_desc(aead);
|
return chachapoly_set_sh_desc(aead);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче