From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: linux-crypto@vger.kernel.org
Cc: herbert@gondor.apana.org.au, ebiggers@kernel.org,
horia.geanta@nxp.com, Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH v4 14/30] crypto: ixp4xx/des - switch to new verification routines
Date: Mon, 5 Aug 2019 20:00:21 +0300 [thread overview]
Message-ID: <20190805170037.31330-15-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20190805170037.31330-1-ard.biesheuvel@linaro.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
drivers/crypto/ixp4xx_crypto.c | 28 +++++++-------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c
index acedafe3fa98..d3d683107050 100644
--- a/drivers/crypto/ixp4xx_crypto.c
+++ b/drivers/crypto/ixp4xx_crypto.c
@@ -17,7 +17,7 @@
#include <linux/module.h>
#include <crypto/ctr.h>
-#include <crypto/des.h>
+#include <crypto/internal/des.h>
#include <crypto/aes.h>
#include <crypto/hmac.h>
#include <crypto/sha.h>
@@ -756,10 +756,7 @@ static int setup_cipher(struct crypto_tfm *tfm, int encrypt,
}
cipher_cfg |= keylen_cfg;
} else {
- u32 tmp[DES_EXPKEY_WORDS];
- if (des_ekey(tmp, key) == 0) {
- *flags |= CRYPTO_TFM_RES_WEAK_KEY;
- }
+ crypto_des_verify_key(tfm, key, key_len);
}
/* write cfg word to cryptinfo */
*(u32*)cinfo = cpu_to_be32(cipher_cfg);
@@ -851,14 +848,8 @@ static int ablk_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
static int ablk_des3_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
unsigned int key_len)
{
- u32 flags = crypto_ablkcipher_get_flags(tfm);
- int err;
-
- err = __des3_verify_key(&flags, key);
- if (unlikely(err))
- crypto_ablkcipher_set_flags(tfm, flags);
-
- return ablk_setkey(tfm, key, key_len);
+ return crypto_des3_ede_verify_key(crypto_ablkcipher_tfm(tfm), key) ?:
+ ablk_setkey(tfm, key, key_len);
}
static int ablk_rfc3686_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
@@ -1181,7 +1172,6 @@ static int des3_aead_setkey(struct crypto_aead *tfm, const u8 *key,
unsigned int keylen)
{
struct ixp_ctx *ctx = crypto_aead_ctx(tfm);
- u32 flags = CRYPTO_TFM_RES_BAD_KEY_LEN;
struct crypto_authenc_keys keys;
int err;
@@ -1193,12 +1183,13 @@ static int des3_aead_setkey(struct crypto_aead *tfm, const u8 *key,
if (keys.authkeylen > sizeof(ctx->authkey))
goto badkey;
- if (keys.enckeylen != DES3_EDE_KEY_SIZE)
+ if (keys.enckeylen != DES3_EDE_KEY_SIZE) {
+ crypto_aead_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
goto badkey;
+ }
- flags = crypto_aead_get_flags(tfm);
- err = __des3_verify_key(&flags, keys.enckey);
- if (unlikely(err))
+ err = crypto_des3_ede_verify_key(crypto_aead_tfm(tfm), keys.enckey);
+ if (err)
goto badkey;
memcpy(ctx->authkey, keys.authkey, keys.authkeylen);
@@ -1209,7 +1200,6 @@ static int des3_aead_setkey(struct crypto_aead *tfm, const u8 *key,
memzero_explicit(&keys, sizeof(keys));
return aead_setup(tfm, crypto_aead_authsize(tfm));
badkey:
- crypto_aead_set_flags(tfm, flags);
memzero_explicit(&keys, sizeof(keys));
return err;
}
--
2.17.1
next prev parent reply other threads:[~2019-08-05 17:01 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 ` Ard Biesheuvel [this message]
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=20190805170037.31330-15-ard.biesheuvel@linaro.org \
--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).