Merge pull request #10912 from danielinux/mcdc-test-coverage

MC/DC coverage for wolfCrypt modules - Part 3

Author: JacobBarthelmeh

CMakeLists.txt

@@ -4399,6 +4399,7 @@ if(WOLFSSL_EXAMPLES)
         tests/api/test_hash.c
         tests/api/test_hmac.c
         tests/api/test_cmac.c
+        tests/api/test_kdf.c
         tests/api/test_she.c
         tests/api/test_des3.c
         tests/api/test_chacha.c
@@ -4411,7 +4412,10 @@ if(WOLFSSL_EXAMPLES)
         tests/api/test_ascon.c
         tests/api/test_sm4.c
         tests/api/test_wc_encrypt.c
+        tests/api/test_coding.c
+        tests/api/test_error.c
         tests/api/test_random.c
+        tests/api/test_wolfentropy.c
         tests/api/test_wolfmath.c
         tests/api/test_rsa.c
         tests/api/test_dsa.c

tests/api.c

@@ -211,6 +211,7 @@
 #include <tests/api/test_hash.h>
 #include <tests/api/test_hmac.h>
 #include <tests/api/test_cmac.h>
+#include <tests/api/test_kdf.h>
 #include <tests/api/test_she.h>
 #include <tests/api/test_des3.h>
 #include <tests/api/test_chacha.h>
@@ -223,7 +224,10 @@
 #include <tests/api/test_ascon.h>
 #include <tests/api/test_sm4.h>
 #include <tests/api/test_wc_encrypt.h>
+#include <tests/api/test_coding.h>
+#include <tests/api/test_error.h>
 #include <tests/api/test_random.h>
+#include <tests/api/test_wolfentropy.h>
 #include <tests/api/test_wolfmath.h>
 #include <tests/api/test_rsa.h>
 #include <tests/api/test_dsa.h>
@@ -7525,10 +7529,25 @@ static int test_wolfSSL_read_write_ex(void)
     ExpectIntEQ(XSTRCMP((char*)buf, test_str), 0);
 
 
-    ExpectIntEQ(wolfSSL_shutdown(ssl_c), WOLFSSL_SHUTDOWN_NOT_DONE);
-    ExpectIntEQ(wolfSSL_shutdown(ssl_s), WOLFSSL_SHUTDOWN_NOT_DONE);
-    ExpectIntEQ(wolfSSL_shutdown(ssl_c), WOLFSSL_SUCCESS);
-    ExpectIntEQ(wolfSSL_shutdown(ssl_s), WOLFSSL_SUCCESS);
+    /* Drive the bidirectional close-notify exchange to completion instead of
+     * asserting a fixed NOT_DONE/SUCCESS sequence: the number of shutdown
+     * round-trips is protocol-version/config dependent, so a hard-coded
+     * sequence is fragile (fails e.g. under the cmake old-TLS build). */
+    {
+        int shutC = WOLFSSL_SHUTDOWN_NOT_DONE;
+        int shutS = WOLFSSL_SHUTDOWN_NOT_DONE;
+        int shutIt;
+        for (shutIt = 0; shutIt < 10 &&
+                (shutC != WOLFSSL_SUCCESS || shutS != WOLFSSL_SUCCESS);
+                shutIt++) {
+            if (shutC != WOLFSSL_SUCCESS)
+                shutC = wolfSSL_shutdown(ssl_c);
+            if (shutS != WOLFSSL_SUCCESS)
+                shutS = wolfSSL_shutdown(ssl_s);
+        }
+        ExpectIntEQ(shutC, WOLFSSL_SUCCESS);
+        ExpectIntEQ(shutS, WOLFSSL_SUCCESS);
+    }
 
     wolfSSL_free(ssl_c);
     wolfSSL_free(ssl_s);
@@ -37011,6 +37030,8 @@ TEST_CASE testCases[] = {
     TEST_HMAC_DECLS,
     /* CMAC */
     TEST_CMAC_DECLS,
+    /* KDF */
+    TEST_KDF_DECLS,
     /* SHE */
     TEST_SHE_DECLS,
 #ifdef WOLFSSL_SHE_EXTENDED
@@ -37052,9 +37073,14 @@ TEST_CASE testCases[] = {
     TEST_SM4_DECLS,
     /* wc_encrypt API */
     TEST_WC_ENCRYPT_DECLS,
+    /* wolfCrypt coding (Base64/Base16) */
+    TEST_CODING_DECLS,
+    /* wolfCrypt error strings */
+    TEST_ERROR_DECLS,
 
     /* RNG tests */
     TEST_RANDOM_DECLS,
+    TEST_WOLFENTROPY_DECLS,
 
     /* Public key */
     /* wolfmath MP API tests */

tests/api/include.am

@@ -18,6 +18,7 @@ tests_unit_test_SOURCES += tests/api/test_hash.c
 # MAC
 tests_unit_test_SOURCES += tests/api/test_hmac.c
 tests_unit_test_SOURCES += tests/api/test_cmac.c
+tests_unit_test_SOURCES += tests/api/test_kdf.c
 # SHE
 tests_unit_test_SOURCES += tests/api/test_she.c
 # Cipher
@@ -32,8 +33,11 @@ tests_unit_test_SOURCES += tests/api/test_aes.c
 tests_unit_test_SOURCES += tests/api/test_ascon.c
 tests_unit_test_SOURCES += tests/api/test_sm4.c
 tests_unit_test_SOURCES += tests/api/test_wc_encrypt.c
+tests_unit_test_SOURCES += tests/api/test_coding.c
+tests_unit_test_SOURCES += tests/api/test_error.c
 # Random
 tests_unit_test_SOURCES += tests/api/test_random.c
+tests_unit_test_SOURCES += tests/api/test_wolfentropy.c
 # MP
 tests_unit_test_SOURCES += tests/api/test_wolfmath.c
 # Public Key Algorithm
@@ -139,6 +143,7 @@ EXTRA_DIST += tests/api/test_digest.h
 EXTRA_DIST += tests/api/test_hash.h
 EXTRA_DIST += tests/api/test_hmac.h
 EXTRA_DIST += tests/api/test_cmac.h
+EXTRA_DIST += tests/api/test_kdf.h
 EXTRA_DIST += tests/api/test_she.h
 EXTRA_DIST += tests/api/test_des3.h
 EXTRA_DIST += tests/api/test_chacha.h
@@ -152,7 +157,10 @@ EXTRA_DIST += tests/api/test_ascon.h
 EXTRA_DIST += tests/api/test_sm4.h
 EXTRA_DIST += tests/api/test_ascon_kats.h
 EXTRA_DIST += tests/api/test_wc_encrypt.h
+EXTRA_DIST += tests/api/test_coding.h
+EXTRA_DIST += tests/api/test_error.h
 EXTRA_DIST += tests/api/test_random.h
+EXTRA_DIST += tests/api/test_wolfentropy.h
 EXTRA_DIST += tests/api/test_wolfmath.h
 EXTRA_DIST += tests/api/test_rsa.h
 EXTRA_DIST += tests/api/test_dsa.h