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

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

crypto: hifn/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 00cd6b23

drivers/crypto/hifn_795x.c

+8 −24
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <linux/ktime.h>



#include <crypto/algapi.h>

#include <crypto/des.h>

#include <crypto/internal/des.h>



static char hifn_pll_ref[sizeof("extNNN")] = "ext";

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,

		unsigned int len)

{

	struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher);

	struct hifn_context *ctx = crypto_tfm_ctx(tfm);

	struct hifn_context *ctx = crypto_ablkcipher_ctx(cipher);

	struct hifn_device *dev = ctx->dev;

	int err;



	if (len > HIFN_MAX_CRYPT_KEY_LENGTH) {

		crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);

		return -1;

	}



	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;

		}

	}

	err = verify_ablkcipher_des_key(cipher, key);

	if (err)

		return err;



	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_device *dev = ctx->dev;

	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;

	}



	dev->flags &= ~HIFN_FLAG_OLD_KEY;