Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20190822102454.4549-1-ard.biesheuvel@linaro.org> <8e480e5b-14d5-8ff1-0630-5a53b4646a1c@linux.ibm.com>
In-Reply-To: <8e480e5b-14d5-8ff1-0630-5a53b4646a1c@linux.ibm.com>
From:   Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date:   Wed, 4 Sep 2019 07:23:27 -0700
Message-ID: <CAKv+Gu9KAB299tXWePQGnYX5WforbeJvCg7r1iS54P+d9i5NLg@mail.gmail.com>
Subject: Re: [PATCH cryptodev buildfix] crypto: s390/aes - fix typo in
 XTS_BLOCK_SIZE identifier
To:     Harald Freudenberger <freude@linux.ibm.com>
Cc:     "open list:HARDWARE RANDOM NUMBER GENERATOR CORE" 
        <linux-crypto@vger.kernel.org>,
        Herbert Xu <herbert@gondor.apana.org.au>,
        Christian Borntraeger <borntraeger@de.ibm.com>,
        Reinhard Buendgen <buendgen@de.ibm.com>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-crypto-owner@vger.kernel.org
Precedence: bulk

On Wed, 4 Sep 2019 at 07:21, Harald Freudenberger <freude@linux.ibm.com> wrote:
>
> On 22.08.19 12:24, Ard Biesheuvel wrote:
> > Fix a typo XTS_BLOCKSIZE -> XTS_BLOCK_SIZE, causing the build to
> > break.
> >
> > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > ---
> > Apologies for the sloppiness.
> >
> > Herbert, could we please merge this before cryptodev hits -next?
> >
> >  arch/s390/crypto/aes_s390.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
> > index a34faadc757e..d4f6fd42a105 100644
> > --- a/arch/s390/crypto/aes_s390.c
> > +++ b/arch/s390/crypto/aes_s390.c
> > @@ -586,7 +586,7 @@ static int xts_aes_encrypt(struct blkcipher_desc *desc,
> >       struct s390_xts_ctx *xts_ctx = crypto_blkcipher_ctx(desc->tfm);
> >       struct blkcipher_walk walk;
> >
> > -     if (unlikely(!xts_ctx->fc || (nbytes % XTS_BLOCKSIZE) != 0))
> > +     if (unlikely(!xts_ctx->fc || (nbytes % XTS_BLOCK_SIZE) != 0))
> >               return xts_fallback_encrypt(desc, dst, src, nbytes);
> >
> >       blkcipher_walk_init(&walk, dst, src, nbytes);
> > @@ -600,7 +600,7 @@ static int xts_aes_decrypt(struct blkcipher_desc *desc,
> >       struct s390_xts_ctx *xts_ctx = crypto_blkcipher_ctx(desc->tfm);
> >       struct blkcipher_walk walk;
> >
> > -     if (unlikely(!xts_ctx->fc || (nbytes % XTS_BLOCKSIZE) != 0))
> > +     if (unlikely(!xts_ctx->fc || (nbytes % XTS_BLOCK_SIZE) != 0))
> >               return xts_fallback_decrypt(desc, dst, src, nbytes);
> >
> >       blkcipher_walk_init(&walk, dst, src, nbytes);
>
> Applied together with the aes xts common code fix and the testmanager fixes,
> build and tested. Works fine, Thanks.
> With the 'extra run-time crypto self tests' enabled I see a failure of the s390 xts
> implementation when nbytes=0 is used (should return with EINVAL but actually
> returns with 0). I'll send a fix for this via the s390 maintainers.

Thanks Harald.