Skip to content

Commit 9b95f3a

Browse files
author
Eric Biggers
committed
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>
1 parent cafa7a0 commit 9b95f3a

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

drivers/crypto/amcc/crypto4xx_alg.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -491,19 +491,19 @@ static int crypto4xx_aes_gcm_validate_keylen(unsigned int keylen)
491491
static int crypto4xx_compute_gcm_hash_key_sw(__le32 *hash_start, const u8 *key,
492492
unsigned int keylen)
493493
{
494-
struct crypto_aes_ctx ctx;
494+
struct aes_enckey aes;
495495
uint8_t src[16] = { 0 };
496496
int rc;
497497

498-
rc = aes_expandkey(&ctx, key, keylen);
498+
rc = aes_prepareenckey(&aes, key, keylen);
499499
if (rc) {
500-
pr_err("aes_expandkey() failed: %d\n", rc);
500+
pr_err("aes_prepareenckey() failed: %d\n", rc);
501501
return rc;
502502
}
503503

504-
aes_encrypt(&ctx, src, src);
504+
aes_encrypt(&aes, src, src);
505505
crypto4xx_memcpy_to_le32(hash_start, src, 16);
506-
memzero_explicit(&ctx, sizeof(ctx));
506+
memzero_explicit(&aes, sizeof(aes));
507507
return 0;
508508
}
509509

0 commit comments

Comments
 (0)