[PATCH v5 18/30] crypto: picoxcell/des - switch to new verification routines

[Ard Biesheuvel]

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

diff --git a/drivers/crypto/picoxcell_crypto.c 
b/drivers/crypto/picoxcell_crypto.c
index 9a939b4fd32f..3cbefb41b099 100644
--- a/drivers/crypto/picoxcell_crypto.c
+++ b/drivers/crypto/picoxcell_crypto.c
@@ -6,7 +6,7 @@
 #include <crypto/aes.h>
 #include <crypto/algapi.h>
 #include <crypto/authenc.h>
-#include <crypto/des.h>
+#include <crypto/internal/des.h>
 #include <crypto/md5.h>
 #include <crypto/sha.h>
 #include <crypto/internal/skcipher.h>
@@ -736,16 +736,12 @@ static void spacc_aead_cra_exit(struct crypto_aead *tfm)
 static int spacc_des_setkey(struct crypto_ablkcipher *cipher, const u8 *key,
                            unsigned int len)
 {
-       struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher);
-       struct spacc_ablk_ctx *ctx = crypto_tfm_ctx(tfm);
-       u32 tmp[DES_EXPKEY_WORDS];
+       struct spacc_ablk_ctx *ctx = crypto_ablkcipher_ctx(cipher);
+       int err;
 
-       if (unlikely(!des_ekey(tmp, key)) &&
-           (crypto_ablkcipher_get_flags(cipher) &
-            CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {
-               tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;
-               return -EINVAL;
-       }
+       err = verify_ablkcipher_des_key(cipher, key);
+       if (err)
+               return err;
 
        memcpy(ctx->key, key, len);
        ctx->key_len = len;
@@ -761,15 +757,11 @@ static int spacc_des3_setkey(struct crypto_ablkcipher 
*cipher, const u8 *key,
                             unsigned int len)
 {
        struct spacc_ablk_ctx *ctx = crypto_ablkcipher_ctx(cipher);
-       u32 flags;
        int err;
 
-       flags = crypto_ablkcipher_get_flags(cipher);
-       err = __des3_verify_key(&flags, key);
-       if (unlikely(err)) {
-               crypto_ablkcipher_set_flags(cipher, flags);
+       err = verify_ablkcipher_des3_key(cipher, key);
+       if (err)
                return err;
-       }
 
        memcpy(ctx->key, key, len);
        ctx->key_len = len;
-- 
2.17.1