All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: linux-crypto@vger.kernel.org
Cc: herbert@gondor.apana.org.au, ebiggers@google.com,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [RFC PATCH 06/30] crypto: caam/des - switch to new verification routines
Date: Sat, 22 Jun 2019 02:30:48 +0200	[thread overview]
Message-ID: <20190622003112.31033-7-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20190622003112.31033-1-ard.biesheuvel@linaro.org>

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 drivers/crypto/caam/caamalg.c     | 13 +++--------
 drivers/crypto/caam/caamalg_qi.c  | 23 ++++++++++----------
 drivers/crypto/caam/caamalg_qi2.c | 23 ++++++++++----------
 drivers/crypto/caam/compat.h      |  2 +-
 4 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 5d4fa65a015f..b4ab64146b21 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -633,23 +633,16 @@ static int des3_aead_setkey(struct crypto_aead *aead, const u8 *key,
 			    unsigned int keylen)
 {
 	struct crypto_authenc_keys keys;
-	u32 flags;
 	int err;
 
 	err = crypto_authenc_extractkeys(&keys, key, keylen);
 	if (unlikely(err))
 		goto badkey;
 
-	err = -EINVAL;
-	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);
+	err = crypto_des3_ede_verify_key(crypto_aead_tfm(tfm), keys.enckey,
+					 keys.enckeylen);
+	if (unlikely(err))
 		goto out;
-	}
 
 	err = aead_setkey(aead, key, keylen);
 
diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c
index 32f0f8a72067..01d92ef0142a 100644
--- a/drivers/crypto/caam/caamalg_qi.c
+++ b/drivers/crypto/caam/caamalg_qi.c
@@ -296,23 +296,16 @@ static int des3_aead_setkey(struct crypto_aead *aead, const u8 *key,
 			    unsigned int keylen)
 {
 	struct crypto_authenc_keys keys;
-	u32 flags;
 	int err;
 
 	err = crypto_authenc_extractkeys(&keys, key, keylen);
 	if (unlikely(err))
 		goto badkey;
 
-	err = -EINVAL;
-	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);
+	err = crypto_des3_ede_verify_key(crypto_aead_tfm(aead), keys.enckey,
+					 keys.enckeylen);
+	if (unlikely(err))
 		goto out;
-	}
 
 	err = aead_setkey(aead, key, keylen);
 
@@ -697,8 +690,14 @@ static int skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key,
 static int des3_skcipher_setkey(struct crypto_skcipher *skcipher,
 				const u8 *key, unsigned int keylen)
 {
-	return unlikely(des3_verify_key(skcipher, key)) ?:
-	       skcipher_setkey(skcipher, key, keylen);
+	int err;
+
+	err = crypto_des3_ede_verify_key(crypto_skcipher_tfm(skcipher), key,
+					 keylen);
+	if (unlikely(err))
+		return err;
+
+	return skcipher_setkey(skcipher, key, keylen);
 }
 
 static int xts_skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key,
diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamalg_qi2.c
index 06bf32c32cbd..074fbb8356e5 100644
--- a/drivers/crypto/caam/caamalg_qi2.c
+++ b/drivers/crypto/caam/caamalg_qi2.c
@@ -329,23 +329,16 @@ static int des3_aead_setkey(struct crypto_aead *aead, const u8 *key,
 			    unsigned int keylen)
 {
 	struct crypto_authenc_keys keys;
-	u32 flags;
 	int err;
 
 	err = crypto_authenc_extractkeys(&keys, key, keylen);
 	if (unlikely(err))
 		goto badkey;
 
-	err = -EINVAL;
-	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);
+	err = crypto_des3_ede_verify_key(crypto_aead_tfm(aead), keys.enckey,
+					 keys.enckeylen);
+	if (unlikely(err))
 		goto out;
-	}
 
 	err = aead_setkey(aead, key, keylen);
 
@@ -999,8 +992,14 @@ static int skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key,
 static int des3_skcipher_setkey(struct crypto_skcipher *skcipher,
 				const u8 *key, unsigned int keylen)
 {
-	return unlikely(des3_verify_key(skcipher, key)) ?:
-	       skcipher_setkey(skcipher, key, keylen);
+	int err;
+
+	err = crypto_des3_ede_verify_key(crypto_skcipher_tfm(skcipher), key,
+					 keylen);
+	if (unlikely(err))
+		return err;
+
+	return skcipher_setkey(skcipher, key, keylen);
 }
 
 static int xts_skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key,
diff --git a/drivers/crypto/caam/compat.h b/drivers/crypto/caam/compat.h
index 8639b2df0371..60e2a54c19f1 100644
--- a/drivers/crypto/caam/compat.h
+++ b/drivers/crypto/caam/compat.h
@@ -32,7 +32,7 @@
 #include <crypto/null.h>
 #include <crypto/aes.h>
 #include <crypto/ctr.h>
-#include <crypto/des.h>
+#include <crypto/internal/des.h>
 #include <crypto/gcm.h>
 #include <crypto/sha.h>
 #include <crypto/md5.h>
-- 
2.20.1


  parent reply	other threads:[~2019-06-22  0:31 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-22  0:30 [RFC PATCH 00/30] crypto: DES/3DES cleanup Ard Biesheuvel
2019-06-22  0:30 ` [RFC PATCH 01/30] crypto: des/3des_ede - add new helpers to verify key length Ard Biesheuvel
2019-06-22  5:06   ` Herbert Xu
2019-06-22  7:46     ` Ard Biesheuvel
2019-06-22  0:30 ` [RFC PATCH 02/30] crypto: s390/des - switch to new verification routines Ard Biesheuvel
2019-06-24 10:10   ` Harald Freudenberger
2019-06-22  0:30 ` [RFC PATCH 03/30] crypto: sparc/des " Ard Biesheuvel
2019-06-22  0:30 ` [RFC PATCH 04/30] crypto: atmel/des " Ard Biesheuvel
2019-06-22  0:30 ` [RFC PATCH 05/30] crypto: bcm/des " Ard Biesheuvel
2019-06-27  9:14   ` Horia Geanta
2019-06-27 10:59     ` Ard Biesheuvel
2019-06-22  0:30 ` Ard Biesheuvel [this message]
2019-06-27  9:57   ` [RFC PATCH 06/30] crypto: caam/des " Horia Geanta
2019-06-27 11:00     ` Ard Biesheuvel
2019-06-22  0:30 ` [RFC PATCH 07/30] crypto: cpt/des " Ard Biesheuvel
2019-06-22  0:30 ` [RFC PATCH 08/30] crypto: nitrox/des " Ard Biesheuvel
2019-06-22  0:30 ` [RFC PATCH 09/30] crypto: ccp/des " Ard Biesheuvel
2019-06-22  0:30 ` [RFC PATCH 10/30] crypto: ccree/des " Ard Biesheuvel
2019-06-22  0:30 ` [RFC PATCH 11/30] crypto: hifn/des " Ard Biesheuvel
2019-06-22  0:30 ` [RFC PATCH 12/30] crypto: hisilicon/des " Ard Biesheuvel
2019-06-22  0:30 ` [RFC PATCH 13/30] crypto: safexcel/des " Ard Biesheuvel
2019-06-22  0:30 ` [RFC PATCH 14/30] crypto: ixp4xx/des " Ard Biesheuvel
2019-06-22  0:30 ` [RFC PATCH 15/30] crypto: cesa/des " Ard Biesheuvel
2019-06-22  0:30 ` [RFC PATCH 16/30] crypto: n2/des " Ard Biesheuvel
2019-06-22  0:30 ` [RFC PATCH 17/30] crypto: omap/des " Ard Biesheuvel
2019-06-22  0:31 ` [RFC PATCH 18/30] crypto: picoxcell/des " Ard Biesheuvel
2019-06-22  0:31 ` [RFC PATCH 19/30] crypto: qce/des " Ard Biesheuvel
2019-06-22  0:31 ` [RFC PATCH 20/30] crypto: rk3288/des " Ard Biesheuvel
2019-06-22  0:31 ` [RFC PATCH 21/30] crypto: stm32/des " Ard Biesheuvel
2019-06-22  0:31 ` [RFC PATCH 22/30] crypto: sun4i/des " Ard Biesheuvel
2019-06-22  0:31 ` [RFC PATCH 23/30] crypto: talitos/des " Ard Biesheuvel
2019-06-22  0:31 ` [RFC PATCH 24/30] crypto: ux500/des " Ard Biesheuvel
2019-06-22  0:31 ` [RFC PATCH 25/30] crypto: 3des - move verification out of exported routine Ard Biesheuvel
2019-06-22  0:31 ` [RFC PATCH 26/30] crypto: des - remove unused function Ard Biesheuvel
2019-06-22  0:31 ` [RFC PATCH 27/30] crypto: des - split off DES library from generic DES cipher driver Ard Biesheuvel
2019-06-27  9:10   ` [PATCH] crypto: caam - fix dependency on CRYPTO_DES Horia Geanta
2019-06-27  9:12     ` Ard Biesheuvel
2019-06-27  9:21       ` Horia Geanta
2019-06-22  0:31 ` [RFC PATCH 28/30] crypto: x86/des - switch to library interface Ard Biesheuvel
2019-06-22  0:31 ` [RFC PATCH 29/30] crypto: des - remove now unused __des3_ede_setkey() Ard Biesheuvel
2019-06-22  0:31 ` [RFC PATCH 30/30] fs: cifs: move from the crypto cipher API to the new DES library interface Ard Biesheuvel
2019-06-26  3:40   ` Eric Biggers
2019-06-26  3:31 ` [RFC PATCH 00/30] crypto: DES/3DES cleanup Eric Biggers

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=20190622003112.31033-7-ard.biesheuvel@linaro.org \
    --to=ard.biesheuvel@linaro.org \
    --cc=ebiggers@google.com \
    --cc=herbert@gondor.apana.org.au \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.