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: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index cfb4c2a42b3558b871ab64dde7fbd6647a5ddbe0..72d6c2ca08096634cdac9c0b72cf65a719b8bee0 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -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

diff --git a/drivers/crypto/inside-secure/safexcel_cipher.c b/drivers/crypto/inside-secure/safexcel_cipher.c
index e8742873367101fe1be00435890edf3534f36f0c..ee3a90f028b530f3291e50dbea6da7077f7fec42 100644 (file)
--- a/drivers/crypto/inside-secure/safexcel_cipher.c
+++ b/drivers/crypto/inside-secure/safexcel_cipher.c
@@ -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;