WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8846 from lealem47/zd20027 

Don't include AEAD nonce in decrypted data size
pull/8847/head
JacobBarthelmeh 2025-06-06 15:43:20 -06:00 committed by GitHub
parent 8e9e671a5a 53f3e74bf1
commit 0bac2c2b34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/sniffer.c
View File

@ -6384,10 +6384,31 @@ doPart:
Trace(GOT_APP_DATA_STR); Trace(GOT_APP_DATA_STR);
{ {
word32 inOutIdx = 0; word32 inOutIdx = 0;
int ivExtra = 0;
ret = DoApplicationData(ssl, (byte*)sslFrame, &inOutIdx, SNIFF); ret = DoApplicationData(ssl, (byte*)sslFrame, &inOutIdx, SNIFF);
if (ret == 0) { if (ret == 0) {
ret = ssl->buffers.clearOutputBuffer.length; ret = ssl->buffers.clearOutputBuffer.length;
#ifndef WOLFSSL_AEAD_ONLY
if (ssl->specs.cipher_type == block) {
if (ssl->options.tls1_1)
ivExtra = ssl->specs.block_size;
}
else
#endif
if (ssl->specs.cipher_type == aead) {
if (!ssl->options.tls1_3 &&
ssl->specs.bulk_cipher_algorithm != wolfssl_chacha)
ivExtra = AESGCM_EXP_IV_SZ;
}
ret -= ivExtra;;
#if defined(HAVE_ENCRYPT_THEN_MAC) && \
!defined(WOLFSSL_AEAD_ONLY)
if (ssl->options.startedETMRead)
ret -= MacSize(ssl);
#endif
TraceGotData(ret); TraceGotData(ret);
if (ret) { /* may be blank message */ if (ret) { /* may be blank message */
if (data != NULL) { if (data != NULL) {