[PATCH v3 13/30] crypto: safexcel/des - switch to new verification routines

[Ard Biesheuvel]

Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
---
 drivers/crypto/inside-secure/safexcel_cipher.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/drivers/crypto/inside-secure/safexcel_cipher.c 
b/drivers/crypto/inside-secure/safexcel_cipher.c
index 8cdbdbe35681..7593b99c948c 100644
--- a/drivers/crypto/inside-secure/safexcel_cipher.c
+++ b/drivers/crypto/inside-secure/safexcel_cipher.c
@@ -963,19 +963,11 @@ static int safexcel_des_setkey(struct crypto_skcipher 
*ctfm, const u8 *key,
 {
        struct crypto_tfm *tfm = crypto_skcipher_tfm(ctfm);
        struct safexcel_cipher_ctx *ctx = crypto_tfm_ctx(tfm);
-       u32 tmp[DES_EXPKEY_WORDS];
        int ret;
 
-       if (len != DES_KEY_SIZE) {
-               crypto_skcipher_set_flags(ctfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
-               return -EINVAL;
-       }
-
-       ret = des_ekey(tmp, key);
-       if (!ret && (tfm->crt_flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {
-               tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;
-               return -EINVAL;
-       }
+       ret = crypto_des_verify_key(tfm, key);
+       if (ret)
+               return ret;
 
        /* if context exits and key changed, need to invalidate it */
        if (ctx->base.ctxr_dma)
@@ -1074,8 +1066,8 @@ static int safexcel_des3_ede_setkey(struct 
crypto_skcipher *ctfm,
        struct safexcel_cipher_ctx *ctx = crypto_skcipher_ctx(ctfm);
        int err;
 
-       err = des3_verify_key(ctfm, key);
-       if (unlikely(err))
+       err = crypto_des3_ede_verify_key(crypto_skcipher_tfm(ctfm), key);
+       if (err)
                return err;
 
        /* if context exits and key changed, need to invalidate it */
-- 
2.20.1