From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>, linux-crypto@vger.kernel.org
Cc: herbert@gondor.apana.org.au, ebiggers@kernel.org, horia.geanta@nxp.com
Subject: Re: [PATCH v4 23/30] crypto: talitos/des - switch to new verification routines
Date: Mon, 5 Aug 2019 22:00:47 +0200 [thread overview]
Message-ID: <bb4e8b45-93cc-e849-bd1b-60660da85c21@c-s.fr> (raw)
In-Reply-To: <20190805170037.31330-24-ard.biesheuvel@linaro.org>
Le 05/08/2019 à 19:00, Ard Biesheuvel a écrit :
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>
> ---
> drivers/crypto/talitos.c | 34 ++++----------------
> 1 file changed, 7 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
> index c9d686a0e805..890cf52007f2 100644
> --- a/drivers/crypto/talitos.c
> +++ b/drivers/crypto/talitos.c
> @@ -30,7 +30,7 @@
>
> #include <crypto/algapi.h>
> #include <crypto/aes.h>
> -#include <crypto/des.h>
> +#include <crypto/internal/des.h>
> #include <crypto/sha.h>
> #include <crypto/md5.h>
> #include <crypto/internal/aead.h>
> @@ -939,12 +939,9 @@ static int aead_des3_setkey(struct crypto_aead *authenc,
> if (keys.enckeylen != DES3_EDE_KEY_SIZE)
> goto badkey;
>
> - flags = crypto_aead_get_flags(authenc);
> - err = __des3_verify_key(&flags, keys.enckey);
> - if (unlikely(err)) {
> - crypto_aead_set_flags(authenc, flags);
> + err = crypto_des3_ede_verify_key(crypto_aead_tfm(authenc), keys.enckey);
> + if (err)
> goto out;
> - }
>
> if (ctx->keylen)
> dma_unmap_single(dev, ctx->dma_key, ctx->keylen, DMA_TO_DEVICE);
> @@ -1517,32 +1514,15 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *cipher,
> static int ablkcipher_des_setkey(struct crypto_ablkcipher *cipher,
> const u8 *key, unsigned int keylen)
> {
> - u32 tmp[DES_EXPKEY_WORDS];
> -
> - if (unlikely(crypto_ablkcipher_get_flags(cipher) &
> - CRYPTO_TFM_REQ_FORBID_WEAK_KEYS) &&
> - !des_ekey(tmp, key)) {
> - crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_WEAK_KEY);
> - return -EINVAL;
> - }
> -
> - return ablkcipher_setkey(cipher, key, keylen);
> + return crypto_des_verify_key(crypto_ablkcipher_tfm(cipher), key) ?:
> + ablkcipher_setkey(cipher, key, keylen);
> }
>
> static int ablkcipher_des3_setkey(struct crypto_ablkcipher *cipher,
> const u8 *key, unsigned int keylen)
> {
> - u32 flags;
> - int err;
> -
> - flags = crypto_ablkcipher_get_flags(cipher);
> - err = __des3_verify_key(&flags, key);
> - if (unlikely(err)) {
> - crypto_ablkcipher_set_flags(cipher, flags);
> - return err;
> - }
> -
> - return ablkcipher_setkey(cipher, key, keylen);
> + return crypto_des3_ede_verify_key(crypto_ablkcipher_tfm(cipher), key) ?:
> + ablkcipher_setkey(cipher, key, keylen);
> }
>
> static int ablkcipher_aes_setkey(struct crypto_ablkcipher *cipher,
>
next prev parent reply other threads:[~2019-08-05 20:00 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
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 [this message]
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=bb4e8b45-93cc-e849-bd1b-60660da85c21@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=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).