Merge pull request #4705 from JacobBarthelmeh/DTLS

account for DTLS extra header size when reading msg from pool
wolfSSL · Dec 28, 2021 · 2b670c0 · 2b670c0
2 parents a07673a + 05a19c8
commit 2b670c0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -68,6 +68,7 @@ Release 5.1.0 of wolfSSL embedded TLS has bug fixes and new features including:
 * Fix for build with OPENSSL_EXTRA and NO_WOLFSSL_STUB both defined
 * Use page aligned memory with ECDSA signing and KCAPI
 * Skip expired sessions for TLS 1.3 rather than turning off the resume behavior
+* Fix for DTLS handling dropped or retransmitted messages
 
 ### Improvements/Optimizations
 ###### Build Options and Warnings

diff --git a/README b/README
@@ -147,6 +147,7 @@ Release 5.1.0 of wolfSSL embedded TLS has bug fixes and new features including:
 * Fix for build with OPENSSL_EXTRA and NO_WOLFSSL_STUB both defined
 * Use page aligned memory with ECDSA signing and KCAPI
 * Skip expired sessions for TLS 1.3 rather than turning off the resume behavior
+* Fix for DTLS handling dropped or retransmitted messages
 
 ### Improvements/Optimizations
 ###### Build Options and Warnings

diff --git a/README.md b/README.md
@@ -148,6 +148,7 @@ Release 5.1.0 of wolfSSL embedded TLS has bug fixes and new features including:
 * Fix for build with OPENSSL_EXTRA and NO_WOLFSSL_STUB both defined
 * Use page aligned memory with ECDSA signing and KCAPI
 * Skip expired sessions for TLS 1.3 rather than turning off the resume behavior
+* Fix for DTLS handling dropped or retransmitted messages
 
 ### Improvements/Optimizations
 ###### Build Options and Warnings

diff --git a/src/internal.c b/src/internal.c
@@ -8224,6 +8224,10 @@ int DtlsMsgPoolSend(WOLFSSL* ssl, int sendOnlyFirstPacket)
 #endif
 
 
+                /* add back in header space from saved pool size */
+                sendSz += DTLS_HANDSHAKE_EXTRA;
+                sendSz += DTLS_RECORD_EXTRA;
+
                 if ((ret = CheckAvailableSize(ssl, sendSz)) != 0) {
                     WOLFSSL_ERROR(ret);
                     return ret;