Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
---
drivers/crypto/cavium/nitrox/nitrox_skcipher.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/crypto/cavium/nitrox/nitrox_skcipher.c
b/drivers/crypto/cavium/nitrox/nitrox_skcipher.c
index 7e4a5e69085e..ab8ac05f00a1 100644
--- a/drivers/crypto/cavium/nitrox/nitrox_skcipher.c
+++ b/drivers/crypto/cavium/nitrox/nitrox_skcipher.c
@@ -7,7 +7,7 @@
#include <crypto/aes.h>
#include <crypto/skcipher.h>
#include <crypto/ctr.h>
-#include <crypto/des.h>
+#include <crypto/internal/des.h>
#include <crypto/xts.h>
#include "nitrox_dev.h"
@@ -257,8 +257,13 @@ static int nitrox_aes_decrypt(struct skcipher_request
*skreq)
static int nitrox_3des_setkey(struct crypto_skcipher *cipher,
const u8 *key, unsigned int keylen)
{
- return unlikely(des3_verify_key(cipher, key)) ?:
- nitrox_skcipher_setkey(cipher, 0, key, keylen);
+ int err;
+
+ err = crypto_des3_ede_verify_key(crypto_skcipher_tfm(cipher), key);
+ if (unlikely(err))
+ return err;
+
+ return nitrox_skcipher_setkey(cipher, 0, key, keylen);
}
static int nitrox_3des_encrypt(struct skcipher_request *skreq)
--
2.20.1
