cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync the AESNI aes_gcm_decrypt_generic() impl with the ARM one

Browse Source
This commit is contained in:
Frank Denis 2022-12-11 23:47:46 +01:00
parent 8b9a98c47f
commit a5ea347381
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c
View File

@ -603,7 +603,7 @@ aes_gcm_decrypt_generic(const State *st, GHash *sth, unsigned char mac[ABYTES],
/* 2*PARALLEL_BLOCKS aggregation */ /* 2*PARALLEL_BLOCKS aggregation */
for (; i + 2 * PARALLEL_BLOCKS * 16 <= src_len; i += 2 * PARALLEL_BLOCKS * 16) { while (i + 2 * PARALLEL_BLOCKS * 16 <= src_len) {
counter = incr_counters(rev_counters, counter, PARALLEL_BLOCKS); counter = incr_counters(rev_counters, counter, PARALLEL_BLOCKS);
u = gh_update0(sth, src + i, st->hx[2 * PARALLEL_BLOCKS - 1 - 0]); u = gh_update0(sth, src + i, st->hx[2 * PARALLEL_BLOCKS - 1 - 0]);
@ -615,13 +615,14 @@ aes_gcm_decrypt_generic(const State *st, GHash *sth, unsigned char mac[ABYTES],
counter = incr_counters(rev_counters, counter, PARALLEL_BLOCKS); counter = incr_counters(rev_counters, counter, PARALLEL_BLOCKS);
i += PARALLEL_BLOCKS * 16;
for (j = 0; j < PARALLEL_BLOCKS; j += 1) { for (j = 0; j < PARALLEL_BLOCKS; j += 1) {
gh_update(&u, src + i + j * 16, st->hx[PARALLEL_BLOCKS - 1 - j]); gh_update(&u, src + i + j * 16, st->hx[PARALLEL_BLOCKS - 1 - j]);
} }
sth->acc = gcm_reduce(u); sth->acc = gcm_reduce(u);
encrypt_xor_wide(st, dst + i + PARALLEL_BLOCKS * 16, src + i + PARALLEL_BLOCKS * 16, encrypt_xor_wide(st, dst + i, src + i, rev_counters);
rev_counters); i += PARALLEL_BLOCKS * 16;
} }
/* PARALLEL_BLOCKS aggregation */ /* PARALLEL_BLOCKS aggregation */