Merge branch 'bugfix/aes_gcm_unaligned_psram_v4.4' into 'release/v4.4'

aes: fix potential unaligned access in aes-gcm (v4.4)

See merge request espressif/esp-idf!15801
This commit is contained in:
Mahavir Jain
2021-11-15 12:54:50 +00:00

View File

@@ -108,12 +108,9 @@ static void increment32_j0(esp_gcm_context *ctx, uint8_t *j)
/* Function to xor two data blocks */
static void xor_data(uint8_t *d, const uint8_t *s)
{
uint32_t *dst = (uint32_t *) d;
uint32_t *src = (uint32_t *) s;
*dst++ ^= *src++;
*dst++ ^= *src++;
*dst++ ^= *src++;
*dst++ ^= *src++;
for (int i = 0; i < AES_BLOCK_BYTES; i++) {
d[i] ^= s[i];
}
}