From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "open list:HARDWARE RANDOM NUMBER GENERATOR CORE"
<linux-crypto@vger.kernel.org>,
"Eric Biggers" <ebiggers@kernel.org>,
"Horia Geantă" <horia.geanta@nxp.com>
Subject: Re: [PATCH v4 06/30] crypto: caam/des - switch to new verification routines
Date: Thu, 15 Aug 2019 08:43:38 +0300 [thread overview]
Message-ID: <CAKv+Gu8aX_QQ4WuydX6pu+GZeRzi8_vZ24Dp0dJddpNLfcTxfQ@mail.gmail.com> (raw)
In-Reply-To: <CAKv+Gu93e1T0nzZYgzfvMdzQ6x=3WKHBTQ1vx7n+UHecQLVS6Q@mail.gmail.com>
On Thu, 15 Aug 2019 at 08:01, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
>
> On Thu, 15 Aug 2019 at 07:54, Herbert Xu <herbert@gondor.apana.org.au> wrote:
> >
> > On Mon, Aug 05, 2019 at 08:00:13PM +0300, Ard Biesheuvel wrote:
> > >
> > > @@ -644,14 +643,8 @@ static int des3_aead_setkey(struct crypto_aead *aead, const u8 *key,
> > > if (keys.enckeylen != DES3_EDE_KEY_SIZE)
> > > goto badkey;
> > >
> > > - flags = crypto_aead_get_flags(aead);
> > > - err = __des3_verify_key(&flags, keys.enckey);
> > > - if (unlikely(err)) {
> > > - crypto_aead_set_flags(aead, flags);
> > > - goto out;
> > > - }
> > > -
> > > - err = aead_setkey(aead, key, keylen);
> > > + err = crypto_des3_ede_verify_key(crypto_aead_tfm(aead), keys.enckey) ?:
> > > + aead_setkey(aead, key, keylen);
> >
> > Please don't use crypto_aead_tfm in new code (except in core crypto
> > API code).
> >
> > You should instead provide separate helpers that are type-specific.
> > So crypto_aead_des3_ede_verify_key or verify_aead_des3_key to be
> > more succinct.
> >
>
> OK
So I will end up with
static inline int verify_skcipher_des_key(struct crypto_skcipher *tfm,
const u8 *key)
static inline int verify_skcipher_des3_key(struct crypto_skcipher *tfm,
const u8 *key)
static inline int verify_ablkcipher_des_key(struct crypto_skcipher *tfm,
const u8 *key)
static inline int verify_ablkcipher_des3_key(struct crypto_skcipher *tfm,
const u8 *key)
static inline int verify_aead_des3_key(struct crypto_aead *tfm, const u8 *key,
int keylen)
static inline int verify_aead_des_key(struct crypto_aead *tfm, const u8 *key,
int keylen)
Is that what you had in mind?
next prev parent reply other threads:[~2019-08-15 5:43 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-05 17:00 [PATCH v4 00/30] crypto: DES/3DES cleanup Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 01/30] crypto: des/3des_ede - add new helpers to verify keys Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 02/30] crypto: s390/des - switch to new verification routines Ard Biesheuvel
2019-08-06 6:12 ` Harald Freudenberger
2019-08-05 17:00 ` [PATCH v4 03/30] crypto: sparc/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 04/30] crypto: atmel/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 05/30] crypto: bcm/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 06/30] crypto: caam/des " Ard Biesheuvel
2019-08-15 4:54 ` Herbert Xu
2019-08-15 5:01 ` Ard Biesheuvel
2019-08-15 5:43 ` Ard Biesheuvel [this message]
2019-08-15 11:37 ` Herbert Xu
2019-08-05 17:00 ` [PATCH v4 07/30] crypto: cpt/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 08/30] crypto: nitrox/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 09/30] crypto: ccp/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 10/30] crypto: ccree/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 11/30] crypto: hifn/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 12/30] crypto: hisilicon/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 13/30] crypto: safexcel/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 14/30] crypto: ixp4xx/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 15/30] crypto: cesa/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 16/30] crypto: n2/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 17/30] crypto: omap/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 18/30] crypto: picoxcell/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 19/30] crypto: qce/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 20/30] crypto: rk3288/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 21/30] crypto: stm32/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 22/30] crypto: sun4i/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 23/30] crypto: talitos/des " Ard Biesheuvel
2019-08-05 20:00 ` Christophe Leroy
2019-08-05 17:00 ` [PATCH v4 24/30] crypto: ux500/des " Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 25/30] crypto: 3des - move verification out of exported routine Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 26/30] crypto: des - remove unused function Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 27/30] crypto: des - split off DES library from generic DES cipher driver Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 28/30] crypto: x86/des - switch to library interface Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 29/30] crypto: des - remove now unused __des3_ede_setkey() Ard Biesheuvel
2019-08-05 17:00 ` [PATCH v4 30/30] fs: cifs: move from the crypto cipher API to the new DES library interface Ard Biesheuvel
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=CAKv+Gu8aX_QQ4WuydX6pu+GZeRzi8_vZ24Dp0dJddpNLfcTxfQ@mail.gmail.com \
--to=ard.biesheuvel@linaro.org \
--cc=ebiggers@kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=horia.geanta@nxp.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;
as well as URLs for NNTP newsgroup(s).