feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #5811 from lealem47/zd15184

Browse Source 
Async Sniffer: Fix for decryption after second handshake
This commit is contained in:
David Garske
2022-12-12 08:21:35 -08:00
committed by GitHub
parent 50c5d61998 dd89fe269e
commit b871829833
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/sniffer.c
View File

@ -1454,7 +1454,10 @@ static SnifferServer* GetSnifferServer(IpInfo* ipInfo, TcpInfo* tcpInfo)
MatchAddr(sniffer->server, ipInfo->dst)) MatchAddr(sniffer->server, ipInfo->dst))
break; break;
sniffer = sniffer->next; if (sniffer->next)
sniffer = sniffer->next;
else
break;
} }
#else #else
(void)ipInfo; (void)ipInfo;
@ -4732,15 +4735,17 @@ static int DecryptTls(WOLFSSL* ssl, byte* plain, const byte* input,
int ret = 0; int ret = 0;
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
ret = wolfSSL_AsyncPop(ssl, &ssl->decrypt.state); if (ssl->decrypt.state != CIPHER_STATE_BEGIN) {
if (ret != WC_NOT_PENDING_E) { ret = wolfSSL_AsyncPop(ssl, &ssl->decrypt.state);
/* check for still pending */ if (ret != WC_NOT_PENDING_E) {
if (ret == WC_PENDING_E) /* check for still pending */
return ret; if (ret == WC_PENDING_E)
return ret;
ssl->error = 0; /* clear async */ ssl->error = 0; /* clear async */
/* let failures through so CIPHER_STATE_END logic is run */ /* let failures through so CIPHER_STATE_END logic is run */
}
} }
else else
#endif #endif