From d76c46a96f35b0c331e863ea3721b2995de2797c Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Tue, 28 Jun 2022 14:37:10 -0700
Subject: [PATCH] Fix for sniffer async issue with TLS v1.3.

---
 src/sniffer.c                         | 6 +++++-
 src/tls.c                             | 2 +-
 sslSniffer/sslSnifferTest/snifftest.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/sniffer.c b/src/sniffer.c
index 2658c5b72..71bc3175e 100644
--- a/src/sniffer.c
+++ b/src/sniffer.c
@@ -4398,7 +4398,11 @@ static int DoHandShake(const byte* input, int* sslBytes,
 #endif
 
 #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 */
         /* hash the packet including header */
         /* TLS v1.3 requires the hash for the handshake and transfer key derivation */
diff --git a/src/tls.c b/src/tls.c
index 3d1db0414..b712a43d1 100644
--- a/src/tls.c
+++ b/src/tls.c
@@ -158,7 +158,7 @@ int BuildTlsHandshakeHash(WOLFSSL* ssl, byte* hash, word32* hashLen)
 
     *hashLen = hashSz;
 #ifdef WOLFSSL_CHECK_MEM_ZERO
-     wc_MemZero_Add("TLS hasndshake hash", hash, hashSz);
+     wc_MemZero_Add("TLS handshake hash", hash, hashSz);
 #endif
 
     if (ret != 0)
diff --git a/sslSniffer/sslSnifferTest/snifftest.c b/sslSniffer/sslSnifferTest/snifftest.c
index 3c66a66be..aaadee048 100644
--- a/sslSniffer/sslSnifferTest/snifftest.c
+++ b/sslSniffer/sslSnifferTest/snifftest.c
@@ -827,7 +827,7 @@ int main(int argc, char** argv)
             /* grab next pcap packet */
             packetNumber++;
             packet = pcap_next(pcap, &header);
-        #ifdef QAT_DEBUG
+        #if defined(WOLFSSL_ASYNC_CRYPT) && defined(DEBUG_SNIFFER)
             printf("Packet Number: %d\n", packetNumber);
         #endif
         }