crypto: chelsio - 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_key and struct
aes_enckey).  In encryption-only use cases, 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.  Likewise
for decryption.

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

diff --git a/drivers/crypto/chelsio/chcr_algo.c b/drivers/crypto/chelsio/chcr_algo.c
index 22cbc343198aac7041832cc49e999528ec648601..6dec4228276827c0812f7e93c3423688553b6e63 100644 (file)
--- a/drivers/crypto/chelsio/chcr_algo.c
+++ b/drivers/crypto/chelsio/chcr_algo.c
@@ -1028,7 +1028,7 @@ static int chcr_update_tweak(struct skcipher_request *req, u8 *iv,
        struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
        struct ablk_ctx *ablkctx = ABLK_CTX(c_ctx(tfm));
        struct chcr_skcipher_req_ctx *reqctx = skcipher_request_ctx(req);
-       struct crypto_aes_ctx aes;
+       struct aes_key aes;
        int ret, i;
        u8 *key;
        unsigned int keylen;
@@ -1044,9 +1044,9 @@ static int chcr_update_tweak(struct skcipher_request *req, u8 *iv,
         */
        if (KEY_CONTEXT_CK_SIZE_G(ntohl(ablkctx->key_ctx_hdr))
                        == CHCR_KEYCTX_CIPHER_KEY_SIZE_192)
-               ret = aes_expandkey(&aes, key, keylen - 8);
+               ret = aes_preparekey(&aes, key, keylen - 8);
        else
-               ret = aes_expandkey(&aes, key, keylen);
+               ret = aes_preparekey(&aes, key, keylen);
        if (ret)
                return ret;
        aes_encrypt(&aes, iv, iv);
@@ -3406,7 +3406,7 @@ static int chcr_gcm_setkey(struct crypto_aead *aead, const u8 *key,
        struct chcr_gcm_ctx *gctx = GCM_CTX(aeadctx);
        unsigned int ck_size;
        int ret = 0, key_ctx_size = 0;
-       struct crypto_aes_ctx aes;
+       struct aes_enckey aes;
 
        aeadctx->enckey_len = 0;
        crypto_aead_clear_flags(aeadctx->sw_cipher, CRYPTO_TFM_REQ_MASK);
@@ -3444,7 +3444,7 @@ static int chcr_gcm_setkey(struct crypto_aead *aead, const u8 *key,
        /* Calculate the H = CIPH(K, 0 repeated 16 times).
         * It will go in key context
         */
-       ret = aes_expandkey(&aes, key, keylen);
+       ret = aes_prepareenckey(&aes, key, keylen);
        if (ret) {
                aeadctx->enckey_len = 0;
                goto out;