summaryrefslogtreecommitdiffstats
path: root/drivers/crypto/marvell
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2019-07-02 21:41:26 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2019-07-26 06:56:03 +0200
commit18d8b96daded4123d6f1ec00a390b16e4cf1d40c (patch)
tree6b1a45fb33e04fd321f42d08e8234f178474fd66 /drivers/crypto/marvell
parentcrypto: padlock/aes - switch to library version of key expansion routine (diff)
downloadlinux-18d8b96daded4123d6f1ec00a390b16e4cf1d40c.tar.xz
linux-18d8b96daded4123d6f1ec00a390b16e4cf1d40c.zip
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: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/marvell')
-rw-r--r--drivers/crypto/marvell/cipher.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/marvell/cipher.c b/drivers/crypto/marvell/cipher.c
index f4321f3c0777..fa1997e70b63 100644
--- a/drivers/crypto/marvell/cipher.c
+++ b/drivers/crypto/marvell/cipher.c
@@ -254,7 +254,7 @@ static int mv_cesa_aes_setkey(struct crypto_skcipher *cipher, const u8 *key,
int ret;
int i;
- ret = crypto_aes_expand_key(&ctx->aes, key, len);
+ ret = aes_expandkey(&ctx->aes, key, len);
if (ret) {
crypto_skcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
return ret;