mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
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>
This commit is contained in:
@@ -177,7 +177,7 @@ static int do_encrypt_iv(struct aead_request *req, u32 *tag, u32 *iv)
|
||||
{
|
||||
struct omap_aes_gcm_ctx *ctx = crypto_aead_ctx(crypto_aead_reqtfm(req));
|
||||
|
||||
aes_encrypt(&ctx->actx, (u8 *)tag, (u8 *)iv);
|
||||
aes_encrypt(&ctx->akey, (u8 *)tag, (const u8 *)iv);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -314,7 +314,7 @@ int omap_aes_gcm_setkey(struct crypto_aead *tfm, const u8 *key,
|
||||
struct omap_aes_gcm_ctx *ctx = crypto_aead_ctx(tfm);
|
||||
int ret;
|
||||
|
||||
ret = aes_expandkey(&ctx->actx, key, keylen);
|
||||
ret = aes_prepareenckey(&ctx->akey, key, keylen);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@@ -334,7 +334,7 @@ int omap_aes_4106gcm_setkey(struct crypto_aead *tfm, const u8 *key,
|
||||
return -EINVAL;
|
||||
keylen -= 4;
|
||||
|
||||
ret = aes_expandkey(&ctx->actx, key, keylen);
|
||||
ret = aes_prepareenckey(&ctx->akey, key, keylen);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
||||
@@ -98,7 +98,7 @@ struct omap_aes_ctx {
|
||||
|
||||
struct omap_aes_gcm_ctx {
|
||||
struct omap_aes_ctx octx;
|
||||
struct crypto_aes_ctx actx;
|
||||
struct aes_enckey akey;
|
||||
};
|
||||
|
||||
struct omap_aes_reqctx {
|
||||
|
||||
Reference in New Issue
Block a user