crypto: padlock/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 603413f28fa35b5ac53959b8069d10e1d5ca8108..27121e530ca48378d3a304cbe768011a77741be4 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -27,7 +27,7 @@ config CRYPTO_DEV_PADLOCK_AES
        tristate "PadLock driver for AES algorithm"
        depends on CRYPTO_DEV_PADLOCK
        select CRYPTO_BLKCIPHER
-       select CRYPTO_AES
+       select CRYPTO_LIB_AES
        help
          Use VIA PadLock for AES algorithm.
 

diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
index fbba32e8cb26cfe56fa7b4a5f34c48dcb37fbcd7..8a066125007835dd7a281dec26576e1e4823fa5b 100644 (file)
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
@@ -145,7 +145,7 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
        ctx->cword.encrypt.keygen = 1;
        ctx->cword.decrypt.keygen = 1;
 
-       if (crypto_aes_expand_key(&gen_aes, in_key, key_len)) {
+       if (aes_expandkey(&gen_aes, in_key, key_len)) {
                *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
                return -EINVAL;
        }