crypto: crypto4xx - Use new AES library API

Switch from the old AES library functions (which use struct
crypto_aes_ctx) to the new ones (which use struct aes_enckey).  This
eliminates the unnecessary computation and caching of the decryption
round keys.  The new AES en/decryption functions are also much faster
and use AES instructions when supported by the CPU.

Note that in addition to the change in the key preparation function and
the key struct type itself, the change in the type of the key struct
results in aes_encrypt() (which is temporarily a type-generic macro)
calling the new encryption function rather than the old one.

Acked-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20260112192035.10427-29-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@kernel.org>

diff --git a/drivers/crypto/amcc/crypto4xx_alg.c b/drivers/crypto/amcc/crypto4xx_alg.c
index 38e8a61e91661a1dde445ec29f83574b4514523b..3177dc4f5f7b09b942b0779a0f1d231ad6f9a974 100644 (file)
--- a/drivers/crypto/amcc/crypto4xx_alg.c
+++ b/drivers/crypto/amcc/crypto4xx_alg.c
@@ -491,19 +491,19 @@ static int crypto4xx_aes_gcm_validate_keylen(unsigned int keylen)
 static int crypto4xx_compute_gcm_hash_key_sw(__le32 *hash_start, const u8 *key,
                                             unsigned int keylen)
 {
-       struct crypto_aes_ctx ctx;
+       struct aes_enckey aes;
        uint8_t src[16] = { 0 };
        int rc;
 
-       rc = aes_expandkey(&ctx, key, keylen);
+       rc = aes_prepareenckey(&aes, key, keylen);
        if (rc) {
-               pr_err("aes_expandkey() failed: %d\n", rc);
+               pr_err("aes_prepareenckey() failed: %d\n", rc);
                return rc;
        }
 
-       aes_encrypt(&ctx, src, src);
+       aes_encrypt(&aes, src, src);
        crypto4xx_memcpy_to_le32(hash_start, src, 16);
-       memzero_explicit(&ctx, sizeof(ctx));
+       memzero_explicit(&aes, sizeof(aes));
        return 0;
 }