Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
crypto: nitrox/des - switch to new verification routines
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
authored by
Ard Biesheuvel
and committed by
Herbert Xu
43d81a8b
0e1cbe97
+2
-2
+2
-2
drivers/crypto/cavium/nitrox/nitrox_skcipher.c
+2
-2
drivers/crypto/cavium/nitrox/nitrox_skcipher.c
···
7
7
#include <crypto/aes.h>
8
8
#include <crypto/skcipher.h>
9
9
#include <crypto/ctr.h>
10
-
#include <crypto/des.h>
10
+
#include <crypto/internal/des.h>
11
11
#include <crypto/xts.h>
12
12
13
13
#include "nitrox_dev.h"
···
257
257
static int nitrox_3des_setkey(struct crypto_skcipher *cipher,
258
258
const u8 *key, unsigned int keylen)
259
259
{
260
-
return unlikely(des3_verify_key(cipher, key)) ?:
260
+
return verify_skcipher_des3_key(cipher, key) ?:
261
261
nitrox_skcipher_setkey(cipher, 0, key, keylen);
262
262
}
263
263