On Sun, 4 Jan 2026 21:13:03 -0800, Eric Biggers wrote:
> --- a/drivers/crypto/inside-secure/safexcel_cipher.c
> +++ b/drivers/crypto/inside-secure/safexcel_cipher.c
> @@ -2505,37 +2505,35 @@ static int safexcel_aead_gcm_setkey(struct
> crypto_aead *ctfm, const u8 *key,
> unsigned int len)
> {
> struct crypto_tfm *tfm = crypto_aead_tfm(ctfm);
> struct safexcel_cipher_ctx *ctx = crypto_tfm_ctx(tfm);
> struct safexcel_crypto_priv *priv = ctx->base.priv;
> - struct crypto_aes_ctx aes;
> + struct aes_enckey aes;
> u32 hashkey[AES_BLOCK_SIZE >> 2];
> int ret, i;
>
> - ret = aes_expandkey(&aes, key, len);
> - if (ret) {
> - memzero_explicit(&aes, sizeof(aes));
> + ret = aes_prepareenckey(&aes, key, len);
> + if (ret)
> return ret;
> - }
>
> if (priv->flags & EIP197_TRC_CACHE && ctx->base.ctxr_dma) {
> for (i = 0; i < len / sizeof(u32); i++) {
> - if (le32_to_cpu(ctx->key[i]) != aes.key_enc[i]) {
> + if (ctx->key[i] != get_unaligned((__le32 *)key + i)) {
"key" is big-endian. Casting it to __le32 does not seem correct.
Did you mean "get_unaligned_le32", which also convert the endianness?
> ctx->base.needs_inv = true;
> break;
> }
> }
> }
>
> for (i = 0; i < len / sizeof(u32); i++)
> - ctx->key[i] = cpu_to_le32(aes.key_enc[i]);
> + ctx->key[i] = get_unaligned((__le32 *)key + i);
Same here.
>
> ctx->key_len = len;
>
> /* Compute hash key by encrypting zeroes with cipher key */
> memset(hashkey, 0, AES_BLOCK_SIZE);
> - aes_encrypt(&aes, (u8 *)hashkey, (u8 *)hashkey);
> + aes_encrypt_new(&aes, (u8 *)hashkey, (u8 *)hashkey);
>
> if (priv->flags & EIP197_TRC_CACHE && ctx->base.ctxr_dma) {
> for (i = 0; i < AES_BLOCK_SIZE / sizeof(u32); i++) {
> if (be32_to_cpu(ctx->base.ipad.be[i]) != hashkey[i]) {
> ctx->base.needs_inv = true;
