* [PATCH] crypto: artpec6: set correct iv size for gcm(aes)
@ 2017-12-12 11:20 Lars Persson
2017-12-12 11:29 ` Corentin Labbe
0 siblings, 1 reply; 2+ messages in thread
From: Lars Persson @ 2017-12-12 11:20 UTC (permalink / raw)
To: linux-arm-kernel, linux-crypto; +Cc: Lars Persson
The IV size should not include the 32 bit counter. Because we had the
IV size set as 16 the transform only worked when the IV input was zero
padded.
Fixes: a21eb94fc4d3 ("crypto: axis - add ARTPEC-6/7 crypto accelerator driver")
Signed-off-by: Lars Persson <larper@axis.com>
---
drivers/crypto/axis/artpec6_crypto.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/axis/artpec6_crypto.c b/drivers/crypto/axis/artpec6_crypto.c
index 456278440863..4de1996120e7 100644
--- a/drivers/crypto/axis/artpec6_crypto.c
+++ b/drivers/crypto/axis/artpec6_crypto.c
@@ -1934,7 +1934,7 @@ static int artpec6_crypto_prepare_aead(struct aead_request *areq)
memcpy(req_ctx->hw_ctx.J0, areq->iv, crypto_aead_ivsize(cipher));
// The HW omits the initial increment of the counter field.
- crypto_inc(req_ctx->hw_ctx.J0+12, 4);
+ memcpy(req_ctx->hw_ctx.J0+12, "\x00\x00\x00\x01", 4);
ret = artpec6_crypto_setup_out_descr(common, &req_ctx->hw_ctx,
sizeof(struct artpec6_crypto_aead_hw_ctx), false, false);
@@ -2956,7 +2956,7 @@ static struct aead_alg aead_algos[] = {
.setkey = artpec6_crypto_aead_set_key,
.encrypt = artpec6_crypto_aead_encrypt,
.decrypt = artpec6_crypto_aead_decrypt,
- .ivsize = AES_BLOCK_SIZE,
+ .ivsize = 12,
.maxauthsize = AES_BLOCK_SIZE,
.base = {
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] crypto: artpec6: set correct iv size for gcm(aes)
2017-12-12 11:20 [PATCH] crypto: artpec6: set correct iv size for gcm(aes) Lars Persson
@ 2017-12-12 11:29 ` Corentin Labbe
0 siblings, 0 replies; 2+ messages in thread
From: Corentin Labbe @ 2017-12-12 11:29 UTC (permalink / raw)
To: Lars Persson; +Cc: linux-arm-kernel, linux-crypto, Lars Persson
On Tue, Dec 12, 2017 at 12:20:20PM +0100, Lars Persson wrote:
> The IV size should not include the 32 bit counter. Because we had the
> IV size set as 16 the transform only worked when the IV input was zero
> padded.
>
> Fixes: a21eb94fc4d3 ("crypto: axis - add ARTPEC-6/7 crypto accelerator driver")
> Signed-off-by: Lars Persson <larper@axis.com>
> ---
> drivers/crypto/axis/artpec6_crypto.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/crypto/axis/artpec6_crypto.c b/drivers/crypto/axis/artpec6_crypto.c
> index 456278440863..4de1996120e7 100644
> --- a/drivers/crypto/axis/artpec6_crypto.c
> +++ b/drivers/crypto/axis/artpec6_crypto.c
> @@ -1934,7 +1934,7 @@ static int artpec6_crypto_prepare_aead(struct aead_request *areq)
>
> memcpy(req_ctx->hw_ctx.J0, areq->iv, crypto_aead_ivsize(cipher));
> // The HW omits the initial increment of the counter field.
> - crypto_inc(req_ctx->hw_ctx.J0+12, 4);
> + memcpy(req_ctx->hw_ctx.J0+12, "\x00\x00\x00\x01", 4);
>
> ret = artpec6_crypto_setup_out_descr(common, &req_ctx->hw_ctx,
> sizeof(struct artpec6_crypto_aead_hw_ctx), false, false);
> @@ -2956,7 +2956,7 @@ static struct aead_alg aead_algos[] = {
> .setkey = artpec6_crypto_aead_set_key,
> .encrypt = artpec6_crypto_aead_encrypt,
> .decrypt = artpec6_crypto_aead_decrypt,
> - .ivsize = AES_BLOCK_SIZE,
> + .ivsize = 12,
GCM_AES_IV_SIZE ?
Regards
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-12-12 11:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-12 11:20 [PATCH] crypto: artpec6: set correct iv size for gcm(aes) Lars Persson
2017-12-12 11:29 ` Corentin Labbe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).