WolfSSL
/
wolfssl-examples
mirror of https://github.com/wolfSSL/wolfssl-examples.git
1
0
Fork 0
Code Issues Releases Wiki Activity

F-2895 F-2897 F-2898 F-2899 F-3898: fix cipher suite string colons, nanosecond overflow arithmetic, and shutdown() call in lwIP

pull/318/merge
Emma Stensland 2026-06-30 14:50:24 -06:00 committed by Paul Adelsbach
parent ac4b7b574e
commit 73d813efe4
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dtls/server-dtls-demux.c
View File

@ -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;

10
lwip/example-lwip-native-echoclient.c
View File

@ -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");

2
psk/server-psk-nonblocking.c
View File

@ -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:";

2
psk/server-psk-threaded.c
View File

@ -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:";

2
psk/server-psk.c
View File

@ -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:";