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

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

crypto: cesa/aes - switch to library version of key expansion routine 



Switch to the new AES library that also provides an implementation of
the AES key expansion routine. This removes the dependency on the
generic AES cipher, allowing it to be omitted entirely in the future.

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

drivers/crypto/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -214,7 +214,7 @@ config CRYPTO_CRC32_S390 
config CRYPTO_DEV_MARVELL_CESA

config CRYPTO_DEV_MARVELL_CESA

	tristate "Marvell's Cryptographic Engine driver"

	tristate "Marvell's Cryptographic Engine driver"

	depends on PLAT_ORION || ARCH_MVEBU

	depends on PLAT_ORION || ARCH_MVEBU

	select CRYPTO_AES

	select CRYPTO_LIB_AES

	select CRYPTO_DES

	select CRYPTO_DES

	select CRYPTO_BLKCIPHER

	select CRYPTO_BLKCIPHER

	select CRYPTO_HASH

	select CRYPTO_HASH

drivers/crypto/marvell/cipher.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -254,7 +254,7 @@ static int mv_cesa_aes_setkey(struct crypto_skcipher *cipher, const u8 *key, 
	int ret;

	int ret;

	int i;

	int i;





	ret = crypto_aes_expand_key(&ctx->aes, key, len);

	ret = aes_expandkey(&ctx->aes, key, len);

	if (ret) {

	if (ret) {

		crypto_skcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);

		crypto_skcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);

		return ret;

		return ret;