From 21b7c8e4fe43c314c4abbab93af9715801ba058d Mon Sep 17 00:00:00 2001
From: Andras Fekete <andras@wolfssl.com>
Date: Wed, 1 May 2024 14:13:58 -0400
Subject: [PATCH] Addressing PR comment

---
 tls/client-tls-bio.c         | 5 +++--
 tls/client-tls-cacb.c        | 5 +++--
 tls/client-tls-callback.c    | 5 +++--
 tls/client-tls-cryptocb.c    | 5 +++--
 tls/client-tls-ecdhe.c       | 5 +++--
 tls/client-tls-nonblocking.c | 5 +++--
 tls/client-tls-pkcs12.c      | 5 +++--
 tls/client-tls.c             | 5 +++--
 tls/server-tls-callback.c    | 5 +++--
 tls/server-tls-ecdhe.c       | 5 +++--
 tls/server-tls-nonblocking.c | 5 +++--
 tls/server-tls-threaded.c    | 5 +++--
 tls/server-tls.c             | 5 +++--
 13 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/tls/client-tls-bio.c b/tls/client-tls-bio.c
index 67069fcf..ed9ab573 100644
--- a/tls/client-tls-bio.c
+++ b/tls/client-tls-bio.c
@@ -80,10 +80,11 @@ int main(int argc, char** argv)
 
     /* Create and initialize WOLFSSL_CTX */
 #ifdef USE_TLSV13
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method());
 #else
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method());
 #endif
+    if (ctx == NULL) {
         fprintf(stderr, "ERROR: failed to create WOLFSSL_CTX\n");
         ret = -1; 
         goto exit;
diff --git a/tls/client-tls-cacb.c b/tls/client-tls-cacb.c
index f0217f97..91dc2d1e 100644
--- a/tls/client-tls-cacb.c
+++ b/tls/client-tls-cacb.c
@@ -133,10 +133,11 @@ int Security(int sock)
 
     /* create and initialize WOLFSSL_CTX structure */
 #ifdef USE_TLSV13
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method());
 #else
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method());
 #endif
+    if (ctx == NULL) {
         printf("SSL_CTX_new error.\n");
         ret = EXIT_FAILURE;
         goto exit;
diff --git a/tls/client-tls-callback.c b/tls/client-tls-callback.c
index bebb7245..1e6b11ec 100644
--- a/tls/client-tls-callback.c
+++ b/tls/client-tls-callback.c
@@ -180,10 +180,11 @@ int main(int argc, char** argv)
 
     /* Create and initialize WOLFSSL_CTX */
 #ifdef USE_TLSV13
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method());
 #else
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method());
 #endif
+    if (ctx == NULL) {
         fprintf(stderr, "ERROR: failed to create WOLFSSL_CTX\n");
         ret = -1;
         goto exit;
diff --git a/tls/client-tls-cryptocb.c b/tls/client-tls-cryptocb.c
index ac933df1..60db0f24 100644
--- a/tls/client-tls-cryptocb.c
+++ b/tls/client-tls-cryptocb.c
@@ -138,10 +138,11 @@ int main(int argc, char** argv)
 
     /* Create and initialize WOLFSSL_CTX */
 #ifdef USE_TLSV13
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method());
 #else
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method());
 #endif
+    if (ctx == NULL) {
         fprintf(stderr, "ERROR: failed to create WOLFSSL_CTX\n");
         ret = -1;
         goto exit;
diff --git a/tls/client-tls-ecdhe.c b/tls/client-tls-ecdhe.c
index 70b8ec62..d37ee5ae 100644
--- a/tls/client-tls-ecdhe.c
+++ b/tls/client-tls-ecdhe.c
@@ -84,10 +84,11 @@ int main(int argc, char** argv)
 
     /* Create and initialize WOLFSSL_CTX */
 #ifdef USE_TLSV13
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method());
 #else
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method());
 #endif
+    if (ctx == NULL) {
         fprintf(stderr, "ERROR: failed to create WOLFSSL_CTX\n");
         ret = -1;
         goto exit;
diff --git a/tls/client-tls-nonblocking.c b/tls/client-tls-nonblocking.c
index 5b89841f..c5d00749 100644
--- a/tls/client-tls-nonblocking.c
+++ b/tls/client-tls-nonblocking.c
@@ -132,10 +132,11 @@ int main(int argc, char** argv)
 
     /* Create and initialize WOLFSSL_CTX */
 #ifdef USE_TLSV13
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method());
 #else
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method());
 #endif
+    if (ctx == NULL) {
         fprintf(stderr, "ERROR: failed to create WOLFSSL_CTX\n");
         ret = -1;
         goto exit;
diff --git a/tls/client-tls-pkcs12.c b/tls/client-tls-pkcs12.c
index 930152e1..841e4cbd 100644
--- a/tls/client-tls-pkcs12.c
+++ b/tls/client-tls-pkcs12.c
@@ -134,10 +134,11 @@ int main(int argc, char** argv)
 
     /* Create and initialize WOLFSSL_CTX */
 #ifdef USE_TLSV13
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method());
 #else
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method());
 #endif
+    if (ctx == NULL) {
         fprintf(stderr, "ERROR: failed to create WOLFSSL_CTX\n");
         return -1;
     }
diff --git a/tls/client-tls.c b/tls/client-tls.c
index 3e13610f..d83aca32 100644
--- a/tls/client-tls.c
+++ b/tls/client-tls.c
@@ -101,10 +101,11 @@ int main(int argc, char** argv)
 
     /* Create and initialize WOLFSSL_CTX */
 #ifdef USE_TLSV13
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_3_client_method());
 #else
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_2_client_method());
 #endif
+    if (ctx == NULL) {
         fprintf(stderr, "ERROR: failed to create WOLFSSL_CTX\n");
         ret = -1;
         goto socket_cleanup;
diff --git a/tls/server-tls-callback.c b/tls/server-tls-callback.c
index 3e3cc694..958d3995 100644
--- a/tls/server-tls-callback.c
+++ b/tls/server-tls-callback.c
@@ -178,10 +178,11 @@ int main()
 
     /* Create and initialize WOLFSSL_CTX */
 #ifdef USE_TLSV13
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_server_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_3_server_method());
 #else
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_server_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_2_server_method());
 #endif
+    if (ctx == NULL) {
         fprintf(stderr, "ERROR: failed to create WOLFSSL_CTX\n");
         ret = -1;
         goto exit;
diff --git a/tls/server-tls-ecdhe.c b/tls/server-tls-ecdhe.c
index 824274d9..256a445e 100644
--- a/tls/server-tls-ecdhe.c
+++ b/tls/server-tls-ecdhe.c
@@ -80,10 +80,11 @@ int main()
 
     /* Create and initialize WOLFSSL_CTX */
 #ifdef USE_TLSV13
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_server_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_3_server_method());
 #else
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_server_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_2_server_method());
 #endif
+    if (ctx == NULL) {
         fprintf(stderr, "ERROR: failed to create WOLFSSL_CTX\n");
         ret = -1;
         goto exit;
diff --git a/tls/server-tls-nonblocking.c b/tls/server-tls-nonblocking.c
index d191fcf1..31975892 100644
--- a/tls/server-tls-nonblocking.c
+++ b/tls/server-tls-nonblocking.c
@@ -132,10 +132,11 @@ int main()
 
     /* Create and initialize WOLFSSL_CTX */
 #ifdef USE_TLSV13
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_server_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_3_server_method());
 #else
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_server_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_2_server_method());
 #endif
+    if (ctx == NULL) {
         fprintf(stderr, "ERROR: failed to create WOLFSSL_CTX\n");
         ret = -1;
         goto exit;
diff --git a/tls/server-tls-threaded.c b/tls/server-tls-threaded.c
index c3c2b500..3a9df872 100644
--- a/tls/server-tls-threaded.c
+++ b/tls/server-tls-threaded.c
@@ -201,10 +201,11 @@ int main()
 
     /* Create and initialize WOLFSSL_CTX */
 #ifdef USE_TLSV13
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_server_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_3_server_method());
 #else
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_server_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_2_server_method());
 #endif
+    if (ctx == NULL) {
         fprintf(stderr, "ERROR: failed to create WOLFSSL_CTX\n");
         ret = -1;
         goto exit;
diff --git a/tls/server-tls.c b/tls/server-tls.c
index d20f6453..0811bb02 100644
--- a/tls/server-tls.c
+++ b/tls/server-tls.c
@@ -81,10 +81,11 @@ int main()
 
     /* Create and initialize WOLFSSL_CTX */
 #ifdef USE_TLSV13
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_3_server_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_3_server_method());
 #else
-    if ((ctx = wolfSSL_CTX_new(wolfTLSv1_2_server_method())) == NULL) {
+    ctx = wolfSSL_CTX_new(wolfTLSv1_2_server_method());
 #endif
+    if (ctx == NULL) {
         fprintf(stderr, "ERROR: failed to create WOLFSSL_CTX\n");
         ret = -1;
         goto exit;