Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4b90dbc authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

crypto: n2/des - switch to new verification routines 



Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 9bfa85eb

drivers/crypto/n2_core.c

+9 −23
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <crypto/md5.h>

#include <crypto/sha.h>

#include <crypto/aes.h>

#include <crypto/des.h>

#include <crypto/internal/des.h>

#include <linux/mutex.h>

#include <linux/delay.h>

#include <linux/sched.h>
@@ -757,24 +757,15 @@ static int n2_aes_setkey(struct crypto_ablkcipher *cipher, const u8 *key, 
static int n2_des_setkey(struct crypto_ablkcipher *cipher, const u8 *key,

			 unsigned int keylen)

{

	struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher);

	struct n2_cipher_context *ctx = crypto_tfm_ctx(tfm);

	struct n2_cipher_context *ctx = crypto_ablkcipher_ctx(cipher);

	struct n2_cipher_alg *n2alg = n2_cipher_alg(tfm);

	u32 tmp[DES_EXPKEY_WORDS];

	int err;



	ctx->enc_type = n2alg->enc_type;



	if (keylen != DES_KEY_SIZE) {

		crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);

		return -EINVAL;

	}

	err = verify_ablkcipher_des_key(cipher, key);

	if (err)

		return err;



	err = des_ekey(tmp, key);

	if (err == 0 && (tfm->crt_flags & CRYPTO_TFM_REQ_FORBID_WEAK_KEYS)) {

		tfm->crt_flags |= CRYPTO_TFM_RES_WEAK_KEY;

		return -EINVAL;

	}

	ctx->enc_type = n2alg->enc_type;



	ctx->key_len = keylen;

	memcpy(ctx->key.des, key, keylen);
@@ -784,18 +775,13 @@ static int n2_des_setkey(struct crypto_ablkcipher *cipher, const u8 *key, 
static int n2_3des_setkey(struct crypto_ablkcipher *cipher, const u8 *key,

			  unsigned int keylen)

{

	struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher);

	struct n2_cipher_context *ctx = crypto_tfm_ctx(tfm);

	struct n2_cipher_context *ctx = crypto_ablkcipher_ctx(cipher);

	struct n2_cipher_alg *n2alg = n2_cipher_alg(tfm);

	u32 flags;

	int err;



	flags = crypto_ablkcipher_get_flags(cipher);

	err = __des3_verify_key(&flags, key);

	if (unlikely(err)) {

		crypto_ablkcipher_set_flags(cipher, flags);

	err = verify_ablkcipher_des3_key(cipher, key);

	if (err)

		return err;

	}



	ctx->enc_type = n2alg->enc_type;