From e9b3b5936faa2adf1eb223146391b90b3c8d9300 Mon Sep 17 00:00:00 2001
From: Juliusz Sosinowicz <juliusz@wolfssl.com>
Date: Wed, 27 Jul 2022 14:14:22 +0200
Subject: [PATCH] FreeAsyncCtx should only be called when advancing state

The call to FreeAsyncCtx after SendBuffered was added to clean up state when we are ready to advance state. If we do not advance state, then clean up should be handled in the relevant state.
---
 src/ssl.c   | 16 ++++++++--------
 src/tls13.c | 54 ++++++++++++++++++++++++++---------------------------
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/src/ssl.c b/src/ssl.c
index 014cf64d0..1145f51e2 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -11908,11 +11908,11 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
                         ssl->options.connectState++;
                         WOLFSSL_MSG("connect state: "
                                     "Advanced from last buffered fragment send");
+                    #ifdef WOLFSSL_ASYNC_IO
+                        /* Cleanup async */
+                        FreeAsyncCtx(ssl, 0);
+                    #endif
                     }
-                #ifdef WOLFSSL_ASYNC_IO
-                    /* Cleanup async */
-                    FreeAsyncCtx(ssl, 0);
-                #endif
                 }
                 else {
                     WOLFSSL_MSG("connect state: "
@@ -12438,11 +12438,11 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
                         ssl->options.acceptState++;
                         WOLFSSL_MSG("accept state: "
                                     "Advanced from last buffered fragment send");
+                    #ifdef WOLFSSL_ASYNC_IO
+                        /* Cleanup async */
+                        FreeAsyncCtx(ssl, 0);
+                    #endif
                     }
-                #ifdef WOLFSSL_ASYNC_IO
-                    /* Cleanup async */
-                    FreeAsyncCtx(ssl, 0);
-                #endif
                 }
                 else {
                     WOLFSSL_MSG("accept state: "
diff --git a/src/tls13.c b/src/tls13.c
index e9cd354a7..4c6592835 100644
--- a/src/tls13.c
+++ b/src/tls13.c
@@ -8262,33 +8262,31 @@ static int SendTls13KeyUpdate(WOLFSSL* ssl)
             OPAQUE8_LEN + Dtls13GetRlHeaderLength(1) + DTLS_HANDSHAKE_HEADER_SZ,
             key_update, 0);
     }
-    else {
+    else
 #endif /* WOLFSSL_DTLS13 */
+    {
+        /* This message is always encrypted. */
+        sendSz = BuildTls13Message(ssl, output, outputSz, input,
+                                   headerSz + OPAQUE8_LEN, handshake, 0, 0, 0);
+        if (sendSz < 0)
+            return BUILD_MSG_ERROR;
 
-    /* This message is always encrypted. */
-    sendSz = BuildTls13Message(ssl, output, outputSz, input,
-                               headerSz + OPAQUE8_LEN, handshake, 0, 0, 0);
-    if (sendSz < 0)
-        return BUILD_MSG_ERROR;
+        #ifdef WOLFSSL_CALLBACKS
+            if (ssl->hsInfoOn) AddPacketName(ssl, "KeyUpdate");
+            if (ssl->toInfoOn) {
+                AddPacketInfo(ssl, "KeyUpdate", handshake, output, sendSz,
+                              WRITE_PROTO, ssl->heap);
+            }
+        #endif
 
-    #ifdef WOLFSSL_CALLBACKS
-        if (ssl->hsInfoOn) AddPacketName(ssl, "KeyUpdate");
-        if (ssl->toInfoOn) {
-            AddPacketInfo(ssl, "KeyUpdate", handshake, output, sendSz,
-                          WRITE_PROTO, ssl->heap);
-        }
-    #endif
+        ssl->buffers.outputBuffer.length += sendSz;
 
-    ssl->buffers.outputBuffer.length += sendSz;
-
-    ret = SendBuffered(ssl);
+        ret = SendBuffered(ssl);
 
 
-    if (ret != 0 && ret != WANT_WRITE)
-        return ret;
-#ifdef WOLFSSL_DTLS13
+        if (ret != 0 && ret != WANT_WRITE)
+            return ret;
     }
-#endif /* WOLFSSL_DTLS13 */
 
     /* In DTLS we must wait for the ack before setting up the new keys */
     if (!ssl->options.dtls) {
@@ -9792,7 +9790,7 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl)
                        the value of the enum ConnectState is stored in
                        serialized session. This would make importing serialized
                        session from other wolfSSL version incompatible */
-                    ssl->options.connectState = WAIT_FINISHED_ACK;
+                        ssl->options.connectState = WAIT_FINISHED_ACK;
                     }
                     else
 #endif /* WOLFSSL_DTLS13 */
@@ -9801,16 +9799,16 @@ int wolfSSL_connect_TLSv13(WOLFSSL* ssl)
                     }
                     WOLFSSL_MSG("connect state: "
                                 "Advanced from last buffered fragment send");
+#ifdef WOLFSSL_ASYNC_IO
+                    FreeAsyncCtx(ssl, 0);
+#endif
+
                 }
             }
             else {
                 WOLFSSL_MSG("connect state: "
                             "Not advanced, more fragments to send");
             }
-        #ifdef WOLFSSL_ASYNC_IO
-            FreeAsyncCtx(ssl, 0);
-        #endif
-
 #ifdef WOLFSSL_DTLS13
             if (ssl->options.dtls)
                 ssl->dtls13SendingAckOrRtx =0;
@@ -10878,10 +10876,10 @@ int wolfSSL_accept_TLSv13(WOLFSSL* ssl)
                     ssl->options.acceptState++;
                     WOLFSSL_MSG("accept state: "
                                 "Advanced from last buffered fragment send");
+#ifdef WOLFSSL_ASYNC_IO
+                    FreeAsyncCtx(ssl, 0);
+#endif
                 }
-            #ifdef WOLFSSL_ASYNC_IO
-                FreeAsyncCtx(ssl, 0);
-            #endif
             }
             else {
                 WOLFSSL_MSG("accept state: "