korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-02 08:34:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

crypto: hisilicon/des - switch to new verification routines

Browse Source 
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Ard Biesheuvel 2019-08-15 12:00:54 +03:00 committed by Herbert Xu
parent f4ed686097
commit 894b68d8be
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/crypto/hisilicon/sec/sec_algs.c
View File

@ -9,7 +9,7 @@
#include <crypto/aes.h> #include <crypto/aes.h>
#include <crypto/algapi.h> #include <crypto/algapi.h>
#include <crypto/des.h> #include <crypto/internal/des.h>
#include <crypto/skcipher.h> #include <crypto/skcipher.h>
#include <crypto/xts.h> #include <crypto/xts.h>
#include <crypto/internal/skcipher.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, static int sec_alg_skcipher_setkey_des_ecb(struct crypto_skcipher *tfm,
const u8 *key, unsigned int keylen) const u8 *key, unsigned int keylen)
{ {
if (keylen != DES_KEY_SIZE) return verify_skcipher_des_key(tfm, key) ?:
return -EINVAL; sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_DES_ECB_64);
return sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_DES_ECB_64);
} }
static int sec_alg_skcipher_setkey_des_cbc(struct crypto_skcipher *tfm, static int sec_alg_skcipher_setkey_des_cbc(struct crypto_skcipher *tfm,
const u8 *key, unsigned int keylen) const u8 *key, unsigned int keylen)
{ {
if (keylen != DES_KEY_SIZE) return verify_skcipher_des_key(tfm, key) ?:
return -EINVAL; sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_DES_CBC_64);
return sec_alg_skcipher_setkey(tfm, key, keylen, SEC_C_DES_CBC_64);
} }
static int sec_alg_skcipher_setkey_3des_ecb(struct crypto_skcipher *tfm, static int sec_alg_skcipher_setkey_3des_ecb(struct crypto_skcipher *tfm,
const u8 *key, unsigned int keylen) const u8 *key, unsigned int keylen)
{ {
return unlikely(des3_verify_key(tfm, key)) ?: return verify_skcipher_des3_key(tfm, key) ?:
sec_alg_skcipher_setkey(tfm, key, keylen, sec_alg_skcipher_setkey(tfm, key, keylen,
SEC_C_3DES_ECB_192_3KEY); 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, static int sec_alg_skcipher_setkey_3des_cbc(struct crypto_skcipher *tfm,
const u8 *key, unsigned int keylen) const u8 *key, unsigned int keylen)
{ {
return unlikely(des3_verify_key(tfm, key)) ?: return verify_skcipher_des3_key(tfm, key) ?:
sec_alg_skcipher_setkey(tfm, key, keylen, sec_alg_skcipher_setkey(tfm, key, keylen,
SEC_C_3DES_CBC_192_3KEY); SEC_C_3DES_CBC_192_3KEY);
} }