lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypto: cesa/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:57 +03:00
committed by Herbert Xu
parent 3ca20b65cb
commit 9bfa85ebd5
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/crypto/marvell/cipher.c
View File

@ -10,7 +10,7 @@
*/ */
#include <crypto/aes.h> #include <crypto/aes.h>
#include <crypto/des.h> #include <crypto/internal/des.h>
#include "cesa.h" #include "cesa.h"
@ -272,21 +272,12 @@ static int mv_cesa_aes_setkey(struct crypto_skcipher *cipher, const u8 *key,
static int mv_cesa_des_setkey(struct crypto_skcipher *cipher, const u8 *key, static int mv_cesa_des_setkey(struct crypto_skcipher *cipher, const u8 *key,
unsigned int len) unsigned int len)
{ {
struct crypto_tfm *tfm = crypto_skcipher_tfm(cipher); struct mv_cesa_des_ctx *ctx = crypto_skcipher_ctx(cipher);
struct mv_cesa_des_ctx *ctx = crypto_tfm_ctx(tfm); int err;
u32 tmp[DES_EXPKEY_WORDS];
int ret;
if (len != DES_KEY_SIZE) { err = verify_skcipher_des_key(cipher, key);
crypto_skcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN); if (err)
return -EINVAL; return err;
}
ret = des_ekey(tmp, key);
if (!ret && (tfm->crt_flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {
tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;
return -EINVAL;
}
memcpy(ctx->key, key, DES_KEY_SIZE); memcpy(ctx->key, key, DES_KEY_SIZE);
@ -299,8 +290,8 @@ static int mv_cesa_des3_ede_setkey(struct crypto_skcipher *cipher,
struct mv_cesa_des_ctx *ctx = crypto_skcipher_ctx(cipher); struct mv_cesa_des_ctx *ctx = crypto_skcipher_ctx(cipher);
int err; int err;
err = des3_verify_key(cipher, key); err = verify_skcipher_des3_key(cipher, key);
if (unlikely(err)) if (err)
return err; return err;
memcpy(ctx->key, key, DES3_EDE_KEY_SIZE); memcpy(ctx->key, key, DES3_EDE_KEY_SIZE);