[PATCH v2 21/30] crypto: stm32/des - switch to new verification routines

[Ard Biesheuvel]

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

diff --git a/drivers/crypto/stm32/stm32-cryp.c 
b/drivers/crypto/stm32/stm32-cryp.c
index cddcc97875b2..c1c7124c44aa 100644
--- a/drivers/crypto/stm32/stm32-cryp.c
+++ b/drivers/crypto/stm32/stm32-cryp.c
@@ -15,7 +15,7 @@
 #include <linux/reset.h>
 
 #include <crypto/aes.h>
-#include <crypto/des.h>
+#include <crypto/internal/des.h>
 #include <crypto/engine.h>
 #include <crypto/scatterwalk.h>
 #include <crypto/internal/aead.h>
@@ -767,17 +767,11 @@ static int stm32_cryp_aes_setkey(struct crypto_ablkcipher 
*tfm, const u8 *key,
 static int stm32_cryp_des_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
                                 unsigned int keylen)
 {
-       u32 tmp[DES_EXPKEY_WORDS];
-
-       if (keylen != DES_KEY_SIZE)
-               return -EINVAL;
+       int err;
 
-       if ((crypto_ablkcipher_get_flags(tfm) &
-            CRYPTO_TFM_REQ_FORBID_WEAK_KEYS) &&
-           unlikely(!des_ekey(tmp, key))) {
-               crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_WEAK_KEY);
-               return -EINVAL;
-       }
+       err = crypto_des_verify_key(crypto_ablkcipher_tfm(tfm), key);
+       if (unlikely(err))
+               return err;
 
        return stm32_cryp_setkey(tfm, key, keylen);
 }
@@ -785,15 +779,11 @@ static int stm32_cryp_des_setkey(struct crypto_ablkcipher 
*tfm, const u8 *key,
 static int stm32_cryp_tdes_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
                                  unsigned int keylen)
 {
-       u32 flags;
        int err;
 
-       flags = crypto_ablkcipher_get_flags(tfm);
-       err = __des3_verify_key(&flags, key);
-       if (unlikely(err)) {
-               crypto_ablkcipher_set_flags(tfm, flags);
+       err = crypto_des3_ede_verify_key(crypto_ablkcipher_tfm(tfm), key);
+       if (unlikely(err))
                return err;
-       }
 
        return stm32_cryp_setkey(tfm, key, keylen);
 }
-- 
2.20.1