denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chapoly: Fix memory leak on failed ICV verification if not using in-place decryption

Browse Source 
Fixes: 370fb3feb0 ("chapoly: Provide a generic ChaCha20/Poly1305 AEAD supporting driver backends")
This commit is contained in:
Tobias Brunner
2026-07-22 18:20:12 +02:00
parent 85c02dc16c
commit c6adb20ec7
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/chapoly/chapoly_aead.c
+8 -1
View File
@@ -216,6 +216,8 @@ METHOD(aead_t, decrypt, bool,
chunk_t *plain) chunk_t *plain)
{ {
u_char *out, icv[POLY_ICV_SIZE]; u_char *out, icv[POLY_ICV_SIZE];
bool valid;
if (iv.len != CHACHA_IV_SIZE || encr.len < POLY_ICV_SIZE) if (iv.len != CHACHA_IV_SIZE || encr.len < POLY_ICV_SIZE)
{ {
return FALSE; return FALSE;
@@ -233,7 +235,12 @@ METHOD(aead_t, decrypt, bool,
memcpy(out, encr.ptr, encr.len); memcpy(out, encr.ptr, encr.len);
} }
do_decrypt(this, encr.len, out, iv.ptr, assoc.len, assoc.ptr, icv); do_decrypt(this, encr.len, out, iv.ptr, assoc.len, assoc.ptr, icv);
return memeq_const(icv, encr.ptr + encr.len, POLY_ICV_SIZE); valid = memeq_const(icv, encr.ptr + encr.len, POLY_ICV_SIZE);
if (!valid && plain)
{
chunk_free(plain);
}
return valid;
} }
METHOD(aead_t, get_block_size, size_t, METHOD(aead_t, get_block_size, size_t,