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

crypto: arm/aes-neonbs - 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 fe3b99b6

arch/arm/crypto/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ config CRYPTO_AES_ARM_BS 
	tristate "Bit sliced AES using NEON instructions"

	depends on KERNEL_MODE_NEON

	select CRYPTO_BLKCIPHER

	select CRYPTO_LIB_AES

	select CRYPTO_SIMD

	select CRYPTO_AES

	help

	  Use a faster and more secure NEON based implementation of AES in CBC,

	  CTR and XTS modes

arch/arm/crypto/aes-neonbs-glue.c

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static int aesbs_setkey(struct crypto_skcipher *tfm, const u8 *in_key, 
	struct crypto_aes_ctx rk;

	int err;



	err = crypto_aes_expand_key(&rk, in_key, key_len);

	err = aes_expandkey(&rk, in_key, key_len);

	if (err)

		return err;
@@ -120,7 +120,7 @@ static int aesbs_cbc_setkey(struct crypto_skcipher *tfm, const u8 *in_key, 
	struct crypto_aes_ctx rk;

	int err;



	err = crypto_aes_expand_key(&rk, in_key, key_len);

	err = aes_expandkey(&rk, in_key, key_len);

	if (err)

		return err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE