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

crypto: safexcel/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 18d8b96d

drivers/crypto/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ config CRYPTO_DEV_SAFEXCEL 
	tristate "Inside Secure's SafeXcel cryptographic engine driver"

	depends on OF

	depends on (ARM64 && ARCH_MVEBU) || (COMPILE_TEST && 64BIT)

	select CRYPTO_AES

	select CRYPTO_LIB_AES

	select CRYPTO_AUTHENC

	select CRYPTO_BLKCIPHER

	select CRYPTO_DES

drivers/crypto/inside-secure/safexcel_cipher.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static int safexcel_skcipher_aes_setkey(struct crypto_skcipher *ctfm, 
	struct crypto_aes_ctx aes;

	int ret, i;



	ret = crypto_aes_expand_key(&aes, key, len);

	ret = aes_expandkey(&aes, key, len);

	if (ret) {

		crypto_skcipher_set_flags(ctfm, CRYPTO_TFM_RES_BAD_KEY_LEN);

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE