From 9d632ccaa653d7d1b2f73b4f0085ab2689fceef9 Mon Sep 17 00:00:00 2001 From: Brett Nicholas Date: Wed, 1 Nov 2023 14:32:11 -0600 Subject: [PATCH 1/2] apply lateRL offset to memcpy dest, not src --- src/internal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/internal.c b/src/internal.c index 8bc7cdd1f..858b9ee85 100644 --- a/src/internal.c +++ b/src/internal.c @@ -26884,7 +26884,7 @@ int PickHashSigAlgo(WOLFSSL* ssl, const byte* hashSigAlgo, word32 hashSigAlgoSz) /* add data, put in buffer if bigger than static buffer */ info->packets[info->numberPackets].valueSz = totalSz; if (totalSz < MAX_VALUE_SZ) { - XMEMCPY(info->packets[info->numberPackets].value, data + lateRL, + XMEMCPY(info->packets[info->numberPackets].value + lateRL, data, sz); } else { From ba37dc99330b71b24e76e5a613ca515fd5e1ef40 Mon Sep 17 00:00:00 2001 From: Brett Nicholas Date: Tue, 7 Nov 2023 11:41:01 -0700 Subject: [PATCH 2/2] Fixes bug where example server with WOLFSSL_CALLBACKS hangs when used with -6 option (simulated WANT_WRITE errors) or with DTLS, causing make check to fail --- examples/server/server.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/examples/server/server.c b/examples/server/server.c index 2e28a624e..496c3deb6 100644 --- a/examples/server/server.c +++ b/examples/server/server.c @@ -3392,7 +3392,14 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args) } while (err == WC_PENDING_E); } #else - (void)nonBlocking; + if (nonBlocking) { + #ifdef WOLFSSL_DTLS + if (doDTLS) { + wolfSSL_dtls_set_using_nonblock(ssl, 1); + } + #endif + tcp_set_nonblocking(&clientfd); + } ret = NonBlockingSSL_Accept(ssl); #endif #ifdef WOLFSSL_EARLY_DATA