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

crypto: sun4i/des - switch to new verification routines 

Cc: Corentin Labbe <clabbe.montjoie@gmail.com>
Acked-by: Corentin Labbe <clabbe.montjoie@gmail.com>
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:01:04 +03:00 committed by Herbert Xu
parent b5d0ba83a0
commit 08d4b408e8
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
View File

@ -542,25 +542,11 @@ int sun4i_ss_des_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int keylen) unsigned int keylen)
{ {
struct sun4i_tfm_ctx *op = crypto_skcipher_ctx(tfm); struct sun4i_tfm_ctx *op = crypto_skcipher_ctx(tfm);
struct sun4i_ss_ctx *ss = op->ss; int err;
u32 flags;
u32 tmp[DES_EXPKEY_WORDS];
int ret;
if (unlikely(keylen != DES_KEY_SIZE)) { err = verify_skcipher_des_key(tfm, key);
dev_err(ss->dev, "Invalid keylen %u\n", keylen); if (err)
crypto_skcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN); return err;
return -EINVAL;
}
flags = crypto_skcipher_get_flags(tfm);
ret = des_ekey(tmp, key);
if (unlikely(!ret) && (flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {
crypto_skcipher_set_flags(tfm, CRYPTO_TFM_RES_WEAK_KEY);
dev_dbg(ss->dev, "Weak key %u\n", keylen);
return -EINVAL;
}
op->keylen = keylen; op->keylen = keylen;
memcpy(op->key, key, keylen); memcpy(op->key, key, keylen);
@ -578,8 +564,8 @@ int sun4i_ss_des3_setkey(struct crypto_skcipher *tfm, const u8 *key,
struct sun4i_tfm_ctx *op = crypto_skcipher_ctx(tfm); struct sun4i_tfm_ctx *op = crypto_skcipher_ctx(tfm);
int err; int err;
err = des3_verify_key(tfm, key); err = verify_skcipher_des3_key(tfm, key);
if (unlikely(err)) if (err)
return err; return err;
op->keylen = keylen; op->keylen = keylen;

2
drivers/crypto/sunxi-ss/sun4i-ss.h
View File

@ -29,7 +29,7 @@
#include <crypto/internal/hash.h> #include <crypto/internal/hash.h>
#include <crypto/internal/skcipher.h> #include <crypto/internal/skcipher.h>
#include <crypto/aes.h> #include <crypto/aes.h>
#include <crypto/des.h> #include <crypto/internal/des.h>
#include <crypto/internal/rng.h> #include <crypto/internal/rng.h>
#include <crypto/rng.h> #include <crypto/rng.h>