[PATCH v3 12/30] crypto: hisilicon/des - switch to new verification routines

[Ard Biesheuvel]

Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
---
 drivers/crypto/hisilicon/sec/sec_algs.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/drivers/crypto/hisilicon/sec/sec_algs.c 
b/drivers/crypto/hisilicon/sec/sec_algs.c
index 02768af0dccd..4a9fae297b0f 100644
--- a/drivers/crypto/hisilicon/sec/sec_algs.c
+++ b/drivers/crypto/hisilicon/sec/sec_algs.c
@@ -9,7 +9,7 @@
 
 #include <crypto/aes.h>
 #include <crypto/algapi.h>
-#include <crypto/des.h>
+#include <crypto/internal/des.h>
 #include <crypto/skcipher.h>
 #include <crypto/xts.h>
 #include <crypto/internal/skcipher.h>
@@ -347,25 +347,21 @@ static int sec_alg_skcipher_setkey_aes_xts(struct 
crypto_skcipher *tfm,
 static int sec_alg_skcipher_setkey_des_ecb(struct crypto_skcipher *tfm,
                                           const u8 *key, unsigned int keylen)
 {
-       if (keylen != DES_KEY_SIZE)
-               return -EINVAL;
-
-       return sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_DES_ECB_64);
+       return crypto_des_verify_key(crypto_skcipher_tfm(tfm), key) ?:
+              sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_DES_ECB_64);
 }
 
 static int sec_alg_skcipher_setkey_des_cbc(struct crypto_skcipher *tfm,
                                           const u8 *key, unsigned int keylen)
 {
-       if (keylen != DES_KEY_SIZE)
-               return -EINVAL;
-
-       return sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_DES_CBC_64);
+       return crypto_des_verify_key(crypto_skcipher_tfm(tfm), key) ?:
+              sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_DES_CBC_64);
 }
 
 static int sec_alg_skcipher_setkey_3des_ecb(struct crypto_skcipher *tfm,
                                            const u8 *key, unsigned int keylen)
 {
-       return unlikely(des3_verify_key(tfm, key)) ?:
+       return crypto_des3_ede_verify_key(crypto_skcipher_tfm(tfm), key) ?:
               sec_alg_skcipher_setkey(tfm, key, keylen,
                                       SEC_C_3DES_ECB_192_3KEY);
 }
@@ -373,7 +369,7 @@ static int sec_alg_skcipher_setkey_3des_ecb(struct 
crypto_skcipher *tfm,
 static int sec_alg_skcipher_setkey_3des_cbc(struct crypto_skcipher *tfm,
                                            const u8 *key, unsigned int keylen)
 {
-       return unlikely(des3_verify_key(tfm, key)) ?:
+       return crypto_des3_ede_verify_key(crypto_skcipher_tfm(tfm), key) ?:
               sec_alg_skcipher_setkey(tfm, key, keylen,
                                       SEC_C_3DES_CBC_192_3KEY);
 }
-- 
2.20.1