From 8c3f7a77cae651ff5c04ee6b1e6620586093dd63 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Wed, 3 Jun 2020 15:47:02 -0600 Subject: [PATCH 1/4] cleanup GET messages --- examples/client/client.c | 26 +++++++++++++++----------- examples/server/server.c | 4 ++-- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/examples/client/client.c b/examples/client/client.c index ab4f7ae5c..6b048698b 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -1371,6 +1371,9 @@ static void Usage(void) #endif } +#define MSG32 32 +#define GETMSGSZ 29 + THREAD_RETURN WOLFSSL_THREAD client_test(void* args) { SOCKET_T sockfd = WOLFSSL_SOCKET_INVALID; @@ -1385,11 +1388,11 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) int flatSessionSz = 0; #ifndef WOLFSSL_ALT_TEST_STRINGS - char msg[32] = "hello wolfssl!"; /* GET may make bigger */ - char resumeMsg[32] = "resuming wolfssl!"; + char msg[MSG32] = "hello wolfssl!"; /* GET may make bigger */ + char resumeMsg[MSG32] = "resuming wolfssl!"; #else - char msg[32] = "hello wolfssl!\n"; - char resumeMsg[32] = "resuming wolfssl!\n"; + char msg[MSG32] = "hello wolfssl!\n"; + char resumeMsg[MSG32] = "resuming wolfssl!\n"; #endif char reply[128]; @@ -2737,8 +2740,8 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) if (doMcast) { #ifdef WOLFSSL_MULTICAST byte pms[512]; /* pre master secret */ - byte cr[32]; /* client random */ - byte sr[32]; /* server random */ + byte cr[MSG32]; /* client random */ + byte sr[MSG32]; /* server random */ const byte suite[2] = {0, 0xfe}; /* WDM_WITH_NULL_SHA256 */ XMEMSET(pms, 0x23, sizeof(pms)); @@ -3075,13 +3078,14 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) if (sendGET) { printf("SSL connect ok, sending GET...\n"); - msgSz = sizeof("GET /index.html HTTP/1.0\r\n\r\n"); - XSTRNCPY(msg, "GET /index.html HTTP/1.0\r\n\r\n", msgSz); - msg[msgSz] = '\0'; + char msgGet[GETMSGSZ] = "GET /index.html HTTP/1.0\r\n\r\n"; + XMEMSET(msg, 0, MSG32); + XMEMSET(resumeMsg, 0, MSG32); + msgSz = GETMSGSZ-1; + XSTRNCPY(msg, msgGet, msgSz); resumeSz = msgSz; - XSTRNCPY(resumeMsg, "GET /index.html HTTP/1.0\r\n\r\n", resumeSz); - resumeMsg[resumeSz] = '\0'; + XSTRNCPY(resumeMsg, msgGet, resumeSz); } /* allow some time for exporting the session */ diff --git a/examples/server/server.c b/examples/server/server.c index 192c03a72..aea9ec29b 100644 --- a/examples/server/server.c +++ b/examples/server/server.c @@ -2404,11 +2404,11 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args) /* Write data */ if (!useWebServerMsg) { write_msg = msg; - write_msg_sz = sizeof(msg); + write_msg_sz = XSTRLEN(msg); } else { write_msg = webServerMsg; - write_msg_sz = sizeof(webServerMsg); + write_msg_sz = XSTRLEN(webServerMsg); } ServerWrite(ssl, write_msg, write_msg_sz); From 923fc30043da7f83674a1d437d16829f58a7e9db Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Wed, 3 Jun 2020 17:10:07 -0600 Subject: [PATCH 2/4] Change to memcpy --- examples/client/client.c | 7 ++++--- examples/server/server.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/client/client.c b/examples/client/client.c index 6b048698b..0b2f22d6f 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -3077,15 +3077,16 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) #endif /* HAVE_SECURE_RENEGOTIATION */ if (sendGET) { - printf("SSL connect ok, sending GET...\n"); char msgGet[GETMSGSZ] = "GET /index.html HTTP/1.0\r\n\r\n"; + printf("SSL connect ok, sending GET...\n"); + XMEMSET(msg, 0, MSG32); XMEMSET(resumeMsg, 0, MSG32); msgSz = GETMSGSZ-1; - XSTRNCPY(msg, msgGet, msgSz); + XMEMCPY(msg, msgGet, msgSz); resumeSz = msgSz; - XSTRNCPY(resumeMsg, msgGet, resumeSz); + XMEMCPY(resumeMsg, msgGet, resumeSz); } /* allow some time for exporting the session */ diff --git a/examples/server/server.c b/examples/server/server.c index aea9ec29b..640858422 100644 --- a/examples/server/server.c +++ b/examples/server/server.c @@ -2404,11 +2404,11 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args) /* Write data */ if (!useWebServerMsg) { write_msg = msg; - write_msg_sz = XSTRLEN(msg); + write_msg_sz = (int) XSTRLEN(msg); } else { write_msg = webServerMsg; - write_msg_sz = XSTRLEN(webServerMsg); + write_msg_sz = (int) XSTRLEN(webServerMsg); } ServerWrite(ssl, write_msg, write_msg_sz); From 2285071fbcd36bc6064f05d68ebe0da51a9f7557 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Thu, 4 Jun 2020 09:10:00 -0600 Subject: [PATCH 3/4] Use old convention, consolidate assignments --- examples/client/client.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/examples/client/client.c b/examples/client/client.c index 0b2f22d6f..cf9704438 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -3082,10 +3082,8 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) XMEMSET(msg, 0, MSG32); XMEMSET(resumeMsg, 0, MSG32); - msgSz = GETMSGSZ-1; + msgSz = resumeSz = sizeof(msgGet) - 1; XMEMCPY(msg, msgGet, msgSz); - - resumeSz = msgSz; XMEMCPY(resumeMsg, msgGet, resumeSz); } From fdce5152c5492e6c338b09b86599207536b6e91d Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Wed, 24 Jun 2020 11:25:12 -0600 Subject: [PATCH 4/4] Address peer feedback --- examples/client/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/client/client.c b/examples/client/client.c index cf9704438..ee8bf225b 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -3082,7 +3082,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args) XMEMSET(msg, 0, MSG32); XMEMSET(resumeMsg, 0, MSG32); - msgSz = resumeSz = sizeof(msgGet) - 1; + msgSz = resumeSz = (int) XSTRLEN(msgGet); XMEMCPY(msg, msgGet, msgSz); XMEMCPY(resumeMsg, msgGet, resumeSz); }