[PATCH v2 23/30] crypto: talitos/des - switch to new verification routines

[Ard Biesheuvel]

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

diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index c865f5d5eaba..022292aed9f9 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -30,7 +30,7 @@
 
 #include <crypto/algapi.h>
 #include <crypto/aes.h>
-#include <crypto/des.h>
+#include <crypto/internal/des.h>
 #include <crypto/sha.h>
 #include <crypto/md5.h>
 #include <crypto/internal/aead.h>
@@ -923,12 +923,9 @@ static int aead_des3_setkey(struct crypto_aead *authenc,
        if (keys.enckeylen != DES3_EDE_KEY_SIZE)
                goto badkey;
 
-       flags = crypto_aead_get_flags(authenc);
-       err = __des3_verify_key(&flags, keys.enckey);
-       if (unlikely(err)) {
-               crypto_aead_set_flags(authenc, flags);
+       err = crypto_des3_ede_verify_key(crypto_aead_tfm(authenc), keys.enckey);
+       if (unlikely(err))
                goto out;
-       }
 
        if (ctx->keylen)
                dma_unmap_single(dev, ctx->dma_key, ctx->keylen, DMA_TO_DEVICE);
@@ -1538,14 +1535,11 @@ static int ablkcipher_setkey(struct crypto_ablkcipher 
*cipher,
 static int ablkcipher_des_setkey(struct crypto_ablkcipher *cipher,
                                 const u8 *key, unsigned int keylen)
 {
-       u32 tmp[DES_EXPKEY_WORDS];
+       int err;
 
-       if (unlikely(crypto_ablkcipher_get_flags(cipher) &
-                    CRYPTO_TFM_REQ_FORBID_WEAK_KEYS) &&
-           !des_ekey(tmp, key)) {
-               crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_WEAK_KEY);
-               return -EINVAL;
-       }
+       err = crypto_des_verify_key(crypto_ablkcipher_tfm(cipher), key);
+       if (unlikely(err))
+               return err;
 
        return ablkcipher_setkey(cipher, key, keylen);
 }
@@ -1553,15 +1547,11 @@ static int ablkcipher_des_setkey(struct 
crypto_ablkcipher *cipher,
 static int ablkcipher_des3_setkey(struct crypto_ablkcipher *cipher,
                                  const u8 *key, unsigned int keylen)
 {
-       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 = crypto_des3_ede_verify_key(crypto_ablkcipher_tfm(cipher), key);
+       if (unlikely(err))
                return err;
-       }
 
        return ablkcipher_setkey(cipher, key, keylen);
 }
-- 
2.20.1