[PATCH v4 04/30] crypto: atmel/des - switch to new verification routines

[Ard Biesheuvel]

Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
---
 drivers/crypto/atmel-tdes.c | 28 +++++---------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/drivers/crypto/atmel-tdes.c b/drivers/crypto/atmel-tdes.c
index fa76620281e8..4e1d9ca3a347 100644
--- a/drivers/crypto/atmel-tdes.c
+++ b/drivers/crypto/atmel-tdes.c
@@ -33,7 +33,7 @@
 #include <linux/cryptohash.h>
 #include <crypto/scatterwalk.h>
 #include <crypto/algapi.h>
-#include <crypto/des.h>
+#include <crypto/internal/des.h>
 #include <crypto/hash.h>
 #include <crypto/internal/hash.h>
 #include <linux/platform_data/crypto-atmel.h>
@@ -773,22 +773,12 @@ static void atmel_tdes_dma_cleanup(struct atmel_tdes_dev 
*dd)
 static int atmel_des_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
                           unsigned int keylen)
 {
-       u32 tmp[DES_EXPKEY_WORDS];
-       int err;
-       struct crypto_tfm *ctfm = crypto_ablkcipher_tfm(tfm);
-
        struct atmel_tdes_ctx *ctx = crypto_ablkcipher_ctx(tfm);
+       int err;
 
-       if (keylen != DES_KEY_SIZE) {
-               crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
-               return -EINVAL;
-       }
-
-       err = des_ekey(tmp, key);
-       if (err == 0 && (ctfm->crt_flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {
-               ctfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;
-               return -EINVAL;
-       }
+       err = crypto_des_verify_key(crypto_ablkcipher_tfm(tfm), key);
+       if (err)
+               return err;
 
        memcpy(ctx->key, key, keylen);
        ctx->keylen = keylen;
@@ -800,15 +790,11 @@ static int atmel_tdes_setkey(struct crypto_ablkcipher 
*tfm, const u8 *key,
                           unsigned int keylen)
 {
        struct atmel_tdes_ctx *ctx = crypto_ablkcipher_ctx(tfm);
-       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 (err)
                return err;
-       }
 
        memcpy(ctx->key, key, keylen);
        ctx->keylen = keylen;
-- 
2.17.1