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

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

crypto: stm32/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 4eaef052

drivers/crypto/stm32/stm32-cryp.c

+5 −25
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/reset.h>



#include <crypto/aes.h>

#include <crypto/des.h>

#include <crypto/internal/des.h>

#include <crypto/engine.h>

#include <crypto/scatterwalk.h>

#include <crypto/internal/aead.h>
@@ -767,35 +767,15 @@ static int stm32_cryp_aes_setkey(struct crypto_ablkcipher *tfm, const u8 *key, 
static int stm32_cryp_des_setkey(struct crypto_ablkcipher *tfm, const u8 *key,

				 unsigned int keylen)

{

	u32 tmp[DES_EXPKEY_WORDS];



	if (keylen != DES_KEY_SIZE)

		return -EINVAL;



	if ((crypto_ablkcipher_get_flags(tfm) &

	     CRYPTO_TFM_REQ_FORBID_WEAK_KEYS) &&

	    unlikely(!des_ekey(tmp, key))) {

		crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_WEAK_KEY);

		return -EINVAL;

	}



	return stm32_cryp_setkey(tfm, key, keylen);

	return verify_ablkcipher_des_key(tfm, key) ?:

	       stm32_cryp_setkey(tfm, key, keylen);

}



static int stm32_cryp_tdes_setkey(struct crypto_ablkcipher *tfm, const u8 *key,

				  unsigned int keylen)

{

	u32 flags;

	int err;



	flags = crypto_ablkcipher_get_flags(tfm);

	err = __des3_verify_key(&flags, key);

	if (unlikely(err)) {

		crypto_ablkcipher_set_flags(tfm, flags);

		return err;

	}



	return stm32_cryp_setkey(tfm, key, keylen);

	return verify_ablkcipher_des3_key(tfm, key) ?:

	       stm32_cryp_setkey(tfm, key, keylen);

}



static int stm32_cryp_aes_aead_setkey(struct crypto_aead *tfm, const u8 *key,