Skip to content

Commit 8612043

Browse files
author
Eric Biggers
committed
crypto: omap - 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-32-ebiggers@kernel.org Signed-off-by: Eric Biggers <ebiggers@kernel.org>
1 parent 65c7022 commit 8612043

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/crypto/omap-aes-gcm.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static int do_encrypt_iv(struct aead_request *req, u32 *tag, u32 *iv)
177177
{
178178
struct omap_aes_gcm_ctx *ctx = crypto_aead_ctx(crypto_aead_reqtfm(req));
179179

180-
aes_encrypt(&ctx->actx, (u8 *)tag, (u8 *)iv);
180+
aes_encrypt(&ctx->akey, (u8 *)tag, (const u8 *)iv);
181181
return 0;
182182
}
183183

@@ -314,7 +314,7 @@ int omap_aes_gcm_setkey(struct crypto_aead *tfm, const u8 *key,
314314
struct omap_aes_gcm_ctx *ctx = crypto_aead_ctx(tfm);
315315
int ret;
316316

317-
ret = aes_expandkey(&ctx->actx, key, keylen);
317+
ret = aes_prepareenckey(&ctx->akey, key, keylen);
318318
if (ret)
319319
return ret;
320320

@@ -334,7 +334,7 @@ int omap_aes_4106gcm_setkey(struct crypto_aead *tfm, const u8 *key,
334334
return -EINVAL;
335335
keylen -= 4;
336336

337-
ret = aes_expandkey(&ctx->actx, key, keylen);
337+
ret = aes_prepareenckey(&ctx->akey, key, keylen);
338338
if (ret)
339339
return ret;
340340

drivers/crypto/omap-aes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ struct omap_aes_ctx {
9898

9999
struct omap_aes_gcm_ctx {
100100
struct omap_aes_ctx octx;
101-
struct crypto_aes_ctx actx;
101+
struct aes_enckey akey;
102102
};
103103

104104
struct omap_aes_reqctx {

0 commit comments

Comments
 (0)