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

Fix for sniffer async issue with TLS v1.3.

Browse Source
This commit is contained in:
David Garske
2022-06-28 14:37:10 -07:00
parent e49f07694e
commit d76c46a96f
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sniffer.c
View File

@ -4398,7 +4398,11 @@ static int DoHandShake(const byte* input, int* sslBytes,
#endif #endif
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
if (type != client_hello && type != server_hello) { if (type != client_hello && type != server_hello
#ifdef WOLFSSL_ASYNC_CRYPT
&& session->sslServer->error != WC_PENDING_E
#endif
) {
/* For resumption the hash is before / after client_hello PSK binder */ /* For resumption the hash is before / after client_hello PSK binder */
/* hash the packet including header */ /* hash the packet including header */
/* TLS v1.3 requires the hash for the handshake and transfer key derivation */ /* TLS v1.3 requires the hash for the handshake and transfer key derivation */

2
src/tls.c
View File

@ -158,7 +158,7 @@ int BuildTlsHandshakeHash(WOLFSSL* ssl, byte* hash, word32* hashLen)
*hashLen = hashSz; *hashLen = hashSz;
#ifdef WOLFSSL_CHECK_MEM_ZERO #ifdef WOLFSSL_CHECK_MEM_ZERO
wc_MemZero_Add("TLS hasndshake hash", hash, hashSz); wc_MemZero_Add("TLS handshake hash", hash, hashSz);
#endif #endif
if (ret != 0) if (ret != 0)

2
sslSniffer/sslSnifferTest/snifftest.c
View File

@ -827,7 +827,7 @@ int main(int argc, char** argv)
/* grab next pcap packet */ /* grab next pcap packet */
packetNumber++; packetNumber++;
packet = pcap_next(pcap, &header); packet = pcap_next(pcap, &header);
#ifdef QAT_DEBUG #if defined(WOLFSSL_ASYNC_CRYPT) && defined(DEBUG_SNIFFER)
printf("Packet Number: %d\n", packetNumber); printf("Packet Number: %d\n", packetNumber);
#endif #endif
} }