Tested-by: Horia Geantă <horia.gea...@nxp.com>
Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
---
 drivers/crypto/caam/caamalg.c     | 38 +++++++-------------
 drivers/crypto/caam/caamalg_qi.c  | 13 ++-----
 drivers/crypto/caam/caamalg_qi2.c | 13 ++-----
 drivers/crypto/caam/compat.h      |  2 +-
 4 files changed, 19 insertions(+), 47 deletions(-)

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 43f18253e5b6..9a9a55263b17 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -633,7 +633,6 @@ 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);
@@ -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);
 
 out:
        memzero_explicit(&keys, sizeof(keys));
@@ -785,22 +778,15 @@ static int skcipher_setkey(struct crypto_skcipher 
*skcipher, const u8 *key,
 static int des_skcipher_setkey(struct crypto_skcipher *skcipher,
                               const u8 *key, unsigned int keylen)
 {
-       u32 tmp[DES3_EDE_EXPKEY_WORDS];
-       struct crypto_tfm *tfm = crypto_skcipher_tfm(skcipher);
-
-       if (keylen == DES3_EDE_KEY_SIZE &&
-           __des3_ede_setkey(tmp, &tfm->crt_flags, key, DES3_EDE_KEY_SIZE)) {
-               return -EINVAL;
-       }
-
-       if (!des_ekey(tmp, key) && (crypto_skcipher_get_flags(skcipher) &
-           CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {
-               crypto_skcipher_set_flags(skcipher,
-                                         CRYPTO_TFM_RES_WEAK_KEY);
-               return -EINVAL;
-       }
+       return crypto_des_verify_key(crypto_skcipher_tfm(skcipher), key) ?:
+              skcipher_setkey(skcipher, key, keylen);
+}
 
-       return skcipher_setkey(skcipher, key, keylen);
+static int des3_skcipher_setkey(struct crypto_skcipher *skcipher,
+                               const u8 *key, unsigned int keylen)
+{
+       return crypto_des3_ede_verify_key(crypto_skcipher_tfm(skcipher), key) ?:
+              skcipher_setkey(skcipher, key, keylen);
 }
 
 static int xts_skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key,
@@ -1899,7 +1885,7 @@ static struct caam_skcipher_alg driver_algs[] = {
                                .cra_driver_name = "cbc-3des-caam",
                                .cra_blocksize = DES3_EDE_BLOCK_SIZE,
                        },
-                       .setkey = des_skcipher_setkey,
+                       .setkey = des3_skcipher_setkey,
                        .encrypt = skcipher_encrypt,
                        .decrypt = skcipher_decrypt,
                        .min_keysize = DES3_EDE_KEY_SIZE,
@@ -2018,7 +2004,7 @@ static struct caam_skcipher_alg driver_algs[] = {
                                .cra_driver_name = "ecb-des3-caam",
                                .cra_blocksize = DES3_EDE_BLOCK_SIZE,
                        },
-                       .setkey = des_skcipher_setkey,
+                       .setkey = des3_skcipher_setkey,
                        .encrypt = skcipher_encrypt,
                        .decrypt = skcipher_decrypt,
                        .min_keysize = DES3_EDE_KEY_SIZE,
diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c
index 32f0f8a72067..b3868c996af8 100644
--- a/drivers/crypto/caam/caamalg_qi.c
+++ b/drivers/crypto/caam/caamalg_qi.c
@@ -296,7 +296,6 @@ 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);
@@ -307,14 +306,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);
 
 out:
        memzero_explicit(&keys, sizeof(keys));
@@ -697,7 +690,7 @@ 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)) ?:
+       return crypto_des3_ede_verify_key(crypto_skcipher_tfm(skcipher), key) ?:
               skcipher_setkey(skcipher, key, keylen);
 }
 
diff --git a/drivers/crypto/caam/caamalg_qi2.c 
b/drivers/crypto/caam/caamalg_qi2.c
index a78a36dfa7b9..66a11ef7fd96 100644
--- a/drivers/crypto/caam/caamalg_qi2.c
+++ b/drivers/crypto/caam/caamalg_qi2.c
@@ -330,7 +330,6 @@ 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);
@@ -341,14 +340,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);
 
 out:
        memzero_explicit(&keys, sizeof(keys));
@@ -1000,7 +993,7 @@ 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)) ?:
+       return crypto_des3_ede_verify_key(crypto_skcipher_tfm(skcipher), key) ?:
               skcipher_setkey(skcipher, key, keylen);
 }
 
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.17.1

Reply via email to