From 73d813efe4fc7c85ecff6aa094c774ed292ebc29 Mon Sep 17 00:00:00 2001
From: Emma Stensland <emma.stensland@wolfssl.com>
Date: Tue, 30 Jun 2026 14:50:24 -0600
Subject: [PATCH] F-2895 F-2897 F-2898 F-2899 F-3898: fix cipher suite string
 colons, nanosecond overflow arithmetic, and shutdown() call in lwIP

---
 dtls/server-dtls-demux.c              |  2 +-
 lwip/example-lwip-native-echoclient.c | 10 +++++-----
 psk/server-psk-nonblocking.c          |  2 +-
 psk/server-psk-threaded.c             |  2 +-
 psk/server-psk.c                      |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dtls/server-dtls-demux.c b/dtls/server-dtls-demux.c
index f4cd3030..8817c233 100644
--- a/dtls/server-dtls-demux.c
+++ b/dtls/server-dtls-demux.c
@@ -704,7 +704,7 @@ static void addTimeSpec(struct timespec* ts, WOLFSSL* ssl)
     if (ts->tv_nsec + rem > 999999999) {
         /* does not fit in tv_nsec member */
         ts->tv_sec++;
-        ts->tv_nsec = ts->tv_nsec + rem - 999999999;
+        ts->tv_nsec = ts->tv_nsec + rem - 1000000000;
     }
     else {
         ts->tv_nsec += rem;
diff --git a/lwip/example-lwip-native-echoclient.c b/lwip/example-lwip-native-echoclient.c
index 3d3f18d3..dfe9bdae 100644
--- a/lwip/example-lwip-native-echoclient.c
+++ b/lwip/example-lwip-native-echoclient.c
@@ -117,7 +117,7 @@ void tls_echoclient_connect(void)
             ret = wolfSSL_write(ssl, TEST_MSG, sizeof(TEST_MSG));
             if (ret <= 0) {
                 loggingCb(0, "error when writing TLS message");
-                shutdown();
+                TLS_shutdown();
             }
             else {
                 tlsWaitingForReply = 1;
@@ -133,12 +133,12 @@ void tls_echoclient_connect(void)
                 if (err != SSL_ERROR_WANT_READ &&
                     err != WOLFSSL_ERROR_WANT_WRITE) {
                     loggingCb(0, "error when reading TLS message");
-                    shutdown();
+                    TLS_shutdown();
                 }
             }
             if (ret > 0) {
                 loggingCb(0, reply);
-                shutdown(); /* received reply, done with connection */
+                TLS_shutdown(); /* received reply, done with connection */
             }
         }
     }
@@ -169,7 +169,7 @@ static int TLS_setup(void)
     ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method());
     if (ctx == NULL) {
         loggingCb(0, "ctx was null");
-        shutdown();
+        TLS_shutdown();
         return ERR_MEM;
     }
 
@@ -203,7 +203,7 @@ static int TLS_connect(void)
         if (err != SSL_ERROR_WANT_READ && err != WOLFSSL_ERROR_WANT_WRITE) {
             loggingCb(0, "connect error, shutting down");
             loggingCb(0, wolfSSL_ERR_reason_error_string(err));
-            shutdown();
+            TLS_shutdown();
             return ERR_CONN;
         }
         loggingCb(0, "found want read/write");
diff --git a/psk/server-psk-nonblocking.c b/psk/server-psk-nonblocking.c
index 7f35b74d..cfbdabca 100644
--- a/psk/server-psk-nonblocking.c
+++ b/psk/server-psk-nonblocking.c
@@ -109,7 +109,7 @@ int main()
                       "DHE-PSK-AES128-GCM-SHA256:"
                       "DHE-PSK-AES256-CBC-SHA384:"
                       "DHE-PSK-AES128-CBC-SHA256:"
-                      "DHE-PSK-CHACHA20-POLY1305"
+                      "DHE-PSK-CHACHA20-POLY1305:"
 #endif
                       "ECDHE-PSK-AES128-CBC-SHA256:"
                       "ECDHE-PSK-CHACHA20-POLY1305:";
diff --git a/psk/server-psk-threaded.c b/psk/server-psk-threaded.c
index 387b0e86..c2682e05 100644
--- a/psk/server-psk-threaded.c
+++ b/psk/server-psk-threaded.c
@@ -159,7 +159,7 @@ int main()
                       "DHE-PSK-AES128-GCM-SHA256:"
                       "DHE-PSK-AES256-CBC-SHA384:"
                       "DHE-PSK-AES128-CBC-SHA256:"
-                      "DHE-PSK-CHACHA20-POLY1305"
+                      "DHE-PSK-CHACHA20-POLY1305:"
 #endif
                       "ECDHE-PSK-AES128-CBC-SHA256:"
                       "ECDHE-PSK-CHACHA20-POLY1305:";
diff --git a/psk/server-psk.c b/psk/server-psk.c
index 1fd11f79..c4204542 100644
--- a/psk/server-psk.c
+++ b/psk/server-psk.c
@@ -91,7 +91,7 @@ int main()
                       "DHE-PSK-AES128-GCM-SHA256:"
                       "DHE-PSK-AES256-CBC-SHA384:"
                       "DHE-PSK-AES128-CBC-SHA256:"
-                      "DHE-PSK-CHACHA20-POLY1305"
+                      "DHE-PSK-CHACHA20-POLY1305:"
 #endif
                       "ECDHE-PSK-AES128-CBC-SHA256:"
                       "ECDHE-PSK-CHACHA20-POLY1305:";