openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypto: safexcel/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:55 +03:00 committed by Herbert Xu
parent 894b68d8be
commit 21f5a15e0f
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/crypto/inside-secure/safexcel_cipher.c
View File

@ -220,7 +220,6 @@ static int safexcel_aead_setkey(struct crypto_aead *ctfm, const u8 *key,
struct safexcel_crypto_priv *priv = ctx->priv; struct safexcel_crypto_priv *priv = ctx->priv;
struct crypto_authenc_keys keys; struct crypto_authenc_keys keys;
struct crypto_aes_ctx aes; struct crypto_aes_ctx aes;
u32 flags;
int err = -EINVAL; int err = -EINVAL;
if (crypto_authenc_extractkeys(&keys, key, len) != 0) if (crypto_authenc_extractkeys(&keys, key, len) != 0)
@ -241,12 +240,7 @@ static int safexcel_aead_setkey(struct crypto_aead *ctfm, const u8 *key,
/* Encryption key */ /* Encryption key */
switch (ctx->alg) { switch (ctx->alg) {
case SAFEXCEL_3DES: case SAFEXCEL_3DES:
if (keys.enckeylen != DES3_EDE_KEY_SIZE) err = verify_aead_des3_key(ctfm, keys.enckey, keys.enckeylen);
goto badkey;
flags = crypto_aead_get_flags(ctfm);
err = __des3_verify_key(&flags, keys.enckey);
crypto_aead_set_flags(ctfm, flags);
if (unlikely(err)) if (unlikely(err))
goto badkey_expflags; goto badkey_expflags;
break; break;
@ -1192,16 +1186,12 @@ static int safexcel_cbc_des_decrypt(struct skcipher_request *req)
static int safexcel_des_setkey(struct crypto_skcipher *ctfm, const u8 *key, static int safexcel_des_setkey(struct crypto_skcipher *ctfm, const u8 *key,
unsigned int len) unsigned int len)
{ {
struct crypto_tfm *tfm = crypto_skcipher_tfm(ctfm); struct safexcel_cipher_ctx *ctx = crypto_skcipher_ctx(ctfm);
struct safexcel_cipher_ctx *ctx = crypto_tfm_ctx(tfm);
u32 tmp[DES_EXPKEY_WORDS];
int ret; int ret;
ret = des_ekey(tmp, key); ret = verify_skcipher_des_key(ctfm, key);
if (!ret && (tfm->crt_flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) { if (ret)
tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY; return ret;
return -EINVAL;
}
/* if context exits and key changed, need to invalidate it */ /* if context exits and key changed, need to invalidate it */
if (ctx->base.ctxr_dma) if (ctx->base.ctxr_dma)
@ -1299,8 +1289,8 @@ static int safexcel_des3_ede_setkey(struct crypto_skcipher *ctfm,
struct safexcel_cipher_ctx *ctx = crypto_skcipher_ctx(ctfm); struct safexcel_cipher_ctx *ctx = crypto_skcipher_ctx(ctfm);
int err; int err;
err = des3_verify_key(ctfm, key); err = verify_skcipher_des3_key(ctfm, key);
if (unlikely(err)) if (err)
return err; return err;
/* if context exits and key changed, need to invalidate it */ /* if context exits and key changed, need to invalidate it */