[PATCH v2 24/30] crypto: ux500/des - switch to new verification routines

[Ard Biesheuvel]

Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
---
 drivers/crypto/ux500/cryp/cryp_core.c | 31 +++++---------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/drivers/crypto/ux500/cryp/cryp_core.c 
b/drivers/crypto/ux500/cryp/cryp_core.c
index 7a93cba0877f..447bddd72fe7 100644
--- a/drivers/crypto/ux500/cryp/cryp_core.c
+++ b/drivers/crypto/ux500/cryp/cryp_core.c
@@ -29,7 +29,7 @@
 #include <crypto/aes.h>
 #include <crypto/algapi.h>
 #include <crypto/ctr.h>
-#include <crypto/des.h>
+#include <crypto/internal/des.h>
 #include <crypto/scatterwalk.h>
 
 #include <linux/platform_data/crypto-ux500.h>
@@ -987,26 +987,13 @@ static int des_ablkcipher_setkey(struct crypto_ablkcipher 
*cipher,
                                 const u8 *key, unsigned int keylen)
 {
        struct cryp_ctx *ctx = crypto_ablkcipher_ctx(cipher);
-       u32 *flags = &cipher->base.crt_flags;
-       u32 tmp[DES_EXPKEY_WORDS];
-       int ret;
+       int err;
 
        pr_debug(DEV_DBG_NAME " [%s]", __func__);
-       if (keylen != DES_KEY_SIZE) {
-               *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-               pr_debug(DEV_DBG_NAME " [%s]: CRYPTO_TFM_RES_BAD_KEY_LEN",
-                               __func__);
-               return -EINVAL;
-       }
 
-       ret = des_ekey(tmp, key);
-       if (unlikely(ret == 0) &&
-           (*flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {
-               *flags |= CRYPTO_TFM_RES_WEAK_KEY;
-               pr_debug(DEV_DBG_NAME " [%s]: CRYPTO_TFM_RES_WEAK_KEY",
-                        __func__);
-               return -EINVAL;
-       }
+       err = crypto_des_verify_key(crypto_ablkcipher_tfm(cipher), key);
+       if (unlikely(err))
+               return err;
 
        memcpy(ctx->key, key, keylen);
        ctx->keylen = keylen;
@@ -1019,17 +1006,13 @@ static int des3_ablkcipher_setkey(struct 
crypto_ablkcipher *cipher,
                                  const u8 *key, unsigned int keylen)
 {
        struct cryp_ctx *ctx = crypto_ablkcipher_ctx(cipher);
-       u32 flags;
        int err;
 
        pr_debug(DEV_DBG_NAME " [%s]", __func__);
 
-       flags = crypto_ablkcipher_get_flags(cipher);
-       err = __des3_verify_key(&flags, key);
-       if (unlikely(err)) {
-               crypto_ablkcipher_set_flags(cipher, flags);
+       err = crypto_des3_ede_verify_key(crypto_ablkcipher_tfm(cipher), key);
+       if (unlikely(err))
                return err;
-       }
 
        memcpy(ctx->key, key, keylen);
        ctx->keylen = keylen;
-- 
2.20.1