hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto: hifn/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>
This commit is contained in:
Ard Biesheuvel 2019-08-15 12:00:53 +03:00 committed by Herbert Xu
parent 00cd6b233f
commit f4ed686097
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/crypto/hifn_795x.c
View File

@ -21,7 +21,7 @@
#include <linux/ktime.h> #include <linux/ktime.h>
#include <crypto/algapi.h> #include <crypto/algapi.h>
#include <crypto/des.h> #include <crypto/internal/des.h>
static char hifn_pll_ref[sizeof("extNNN")] = "ext"; static char hifn_pll_ref[sizeof("extNNN")] = "ext";
module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444); module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
@ -1939,25 +1939,13 @@ static void hifn_flush(struct hifn_device *dev)
static int hifn_setkey(struct crypto_ablkcipher *cipher, const u8 *key, static int hifn_setkey(struct crypto_ablkcipher *cipher, const u8 *key,
unsigned int len) unsigned int len)
{ {
struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher); struct hifn_context *ctx = crypto_ablkcipher_ctx(cipher);
struct hifn_context *ctx = crypto_tfm_ctx(tfm);
struct hifn_device *dev = ctx->dev; struct hifn_device *dev = ctx->dev;
int err;
if (len > HIFN_MAX_CRYPT_KEY_LENGTH) { err = verify_ablkcipher_des_key(cipher, key);
crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN); if (err)
return -1; return err;
}
if (len == HIFN_DES_KEY_LENGTH) {
u32 tmp[DES_EXPKEY_WORDS];
int ret = des_ekey(tmp, key);
if (unlikely(ret == 0) &&
(tfm->crt_flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {
tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;
return -EINVAL;
}
}
dev->flags &= ~HIFN_FLAG_OLD_KEY; dev->flags &= ~HIFN_FLAG_OLD_KEY;
@ -1972,15 +1960,11 @@ static int hifn_des3_setkey(struct crypto_ablkcipher *cipher, const u8 *key,
{ {
struct hifn_context *ctx = crypto_ablkcipher_ctx(cipher); struct hifn_context *ctx = crypto_ablkcipher_ctx(cipher);
struct hifn_device *dev = ctx->dev; struct hifn_device *dev = ctx->dev;
u32 flags;
int err; int err;
flags = crypto_ablkcipher_get_flags(cipher); err = verify_ablkcipher_des3_key(cipher, key);
err = __des3_verify_key(&flags, key); if (err)
if (unlikely(err)) {
crypto_ablkcipher_set_flags(cipher, flags);
return err; return err;
}
dev->flags &= ~HIFN_FLAG_OLD_KEY; dev->flags &= ~HIFN_FLAG_OLD_KEY;