Merge pull request wolfSSL#5096 from JacobBarthelmeh/Testing

- static analysis test fixes
criteo-forks · May 2, 2022 · 48cb185 · 48cb185
2 parents 35f4601 + 14ff3d1
commit 48cb185
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 32 deletions.
diff --git a/src/ssl.c b/src/ssl.c
@@ -12737,7 +12737,7 @@ WOLFSSL_ABI
 int wolfSSL_CTX_set_timeout(WOLFSSL_CTX* ctx, unsigned int to)
 {
     #if defined(WOLFSSL_ERROR_CODE_OPENSSL)
-    word32 prev_timeout;
+    word32 prev_timeout = 0;
     #endif
 
     int ret = WOLFSSL_SUCCESS;

diff --git a/tests/api.c b/tests/api.c
@@ -950,9 +950,11 @@ static void test_wolfSSL_CTX_trust_peer_cert(void)
     AssertIntEQ(wolfSSL_trust_peer_cert(ssl, cliCertFile,
                                      WOLFSSL_FILETYPE_PEM), WOLFSSL_SUCCESS);
 
+    #ifdef WOLFSSL_LOCAL_X509_STORE
     /* unload cert */
     AssertIntNE(wolfSSL_Unload_trust_peers(NULL), WOLFSSL_SUCCESS);
     AssertIntEQ(wolfSSL_Unload_trust_peers(ssl), WOLFSSL_SUCCESS);
+    #endif
 #endif
 
     /* Test of loading certs from buffers */
@@ -34252,43 +34254,45 @@ static void test_wolfSSL_Tls13_Key_Logging_test(void)
 #endif
 
     /* check if the keylog file exists */
+    {
+        char buff[300] = {0};
+        int  found[4]   = {0};
+        int  numfnd = 0;
+        int  i;
 
-    char  buff[300] = {0};
-    int  found[4]   = {0};
+        fp = XFOPEN("./MyKeyLog.txt", "r");
 
-    fp = XFOPEN("./MyKeyLog.txt", "r");
-
-    AssertNotNull(fp);
+        AssertNotNull(fp);
 
-    while(XFGETS( buff, (int)sizeof(buff),fp) != NULL ) {
-        if(0 == strncmp(buff,"CLIENT_HANDSHAKE_TRAFFIC_SECRET ",
-                    sizeof("CLIENT_HANDSHAKE_TRAFFIC_SECRET ")-1)) {
-            found[0] = 1;
-            continue;
-        }
-        else if(0 == strncmp(buff,"SERVER_HANDSHAKE_TRAFFIC_SECRET ",
-                    sizeof("SERVER_HANDSHAKE_TRAFFIC_SECRET ")-1)) {
-            found[1] = 1;
-            continue;
-        }
-        else if(0 == strncmp(buff,"CLIENT_TRAFFIC_SECRET_0 ",
-                    sizeof("CLIENT_TRAFFIC_SECRET_0 ")-1)) {
-            found[2] = 1;
-            continue;
+        while (XFGETS( buff, (int)sizeof(buff),fp) != NULL ) {
+            if (0 == strncmp(buff,"CLIENT_HANDSHAKE_TRAFFIC_SECRET ",
+                        sizeof("CLIENT_HANDSHAKE_TRAFFIC_SECRET ")-1)) {
+                found[0] = 1;
+                continue;
+            }
+            else if (0 == strncmp(buff,"SERVER_HANDSHAKE_TRAFFIC_SECRET ",
+                        sizeof("SERVER_HANDSHAKE_TRAFFIC_SECRET ")-1)) {
+                found[1] = 1;
+                continue;
+            }
+            else if (0 == strncmp(buff,"CLIENT_TRAFFIC_SECRET_0 ",
+                        sizeof("CLIENT_TRAFFIC_SECRET_0 ")-1)) {
+                found[2] = 1;
+                continue;
+            }
+            else if (0 == strncmp(buff,"SERVER_TRAFFIC_SECRET_0 ",
+                        sizeof("SERVER_TRAFFIC_SECRET_0 ")-1)) {
+                found[3] = 1;
+                continue;
+            }
         }
-        else if(0 == strncmp(buff,"SERVER_TRAFFIC_SECRET_0 ",
-                    sizeof("SERVER_TRAFFIC_SECRET_0 ")-1)) {
-            found[3] = 1;
-            continue;
+        XFCLOSE(fp);
+        for (i = 0; i < 4; i++) {
+            if( found[i] != 0)
+                numfnd++;
         }
+        AssertIntEQ(numfnd, 4);
     }
-    XFCLOSE(fp);
-    int numfnd = 0;
-    for( uint i = 0; i < 4; i++) {
-        if( found[i] != 0)
-            numfnd++;
-    }
-    AssertIntEQ( numfnd,4 );
 
     printf(resultFmt, passed);