public inbox for linux-crypto@vger.kernel.org
 help / color / mirror / Atom feed
From: Corentin Labbe <clabbe.montjoie@gmail.com>
To: Lars Persson <lars.persson@axis.com>
Cc: linux-arm-kernel@axis.com, linux-crypto@vger.kernel.org,
	Lars Persson <larper@axis.com>
Subject: Re: [PATCH] crypto: artpec6: set correct iv size for gcm(aes)
Date: Tue, 12 Dec 2017 12:29:19 +0100	[thread overview]
Message-ID: <20171212112919.GB6034@Red> (raw)
In-Reply-To: <20171212112020.2269-1-larper@axis.com>

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

      reply	other threads:[~2017-12-12 11:29 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171212112919.GB6034@Red \
    --to=clabbe.montjoie@gmail.com \
    --cc=larper@axis.com \
    --cc=lars.persson@axis.com \
    --cc=linux-arm-kernel@axis.com \
    --cc=linux-crypto@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox