adjust test case for CI tests after additional sanity check

Author: JacobBarthelmeh

tests/api/test_evp_cipher.c

@@ -2195,7 +2195,7 @@ int test_wolfssl_EVP_sm4_ecb(void)
     };
     byte cipherText[sizeof(plainText) + SM4_BLOCK_SIZE];
     byte decryptedText[sizeof(plainText) + SM4_BLOCK_SIZE];
-    EVP_CIPHER_CTX* ctx;
+    EVP_CIPHER_CTX* ctx = NULL;
     int outSz;
 
     XMEMSET(key, 0, sizeof(key));
@@ -2251,7 +2251,7 @@ int test_wolfssl_EVP_sm4_cbc(void)
     };
     byte cipherText[sizeof(plainText) + SM4_BLOCK_SIZE];
     byte decryptedText[sizeof(plainText) + SM4_BLOCK_SIZE];
-    EVP_CIPHER_CTX* ctx;
+    EVP_CIPHER_CTX* ctx = NULL;
     int outSz;
 
     XMEMSET(key, 0, sizeof(key));
@@ -2319,7 +2319,7 @@ int test_wolfssl_EVP_sm4_ctr(void)
     byte plainText[] = {0xDE, 0xAD, 0xBE, 0xEF};
     byte cipherText[sizeof(plainText)];
     byte decryptedText[sizeof(plainText)];
-    EVP_CIPHER_CTX* ctx;
+    EVP_CIPHER_CTX* ctx = NULL;
     int outSz;
 
     XMEMSET(key, 0, sizeof(key));

wolfcrypt/test/test.c

@@ -36427,13 +36427,30 @@ static wc_test_ret_t ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerif
             ret = wc_ecc_sign_hash(digest, ECC_DIGEST_SIZE, sig, &x, rng,
                                                                         userA);
     } while (ret == WC_NO_ERR_TRACE(WC_PENDING_E));
-    if (ret == 0) {
-        ERROR_OUT(WC_TEST_RET_ENC_EC(ret), done);
+#ifdef WOLFSSL_SM2
+    if (curve_id == ECC_SM2P256V1) {
+        /* SM2 does not reject zero-hash signing */
+        if (ret != 0)
+            ERROR_OUT(WC_TEST_RET_ENC_EC(ret), done);
     }
-    else {
-        /* reset ret value, was expecting a failure */
-        ret = 0;
+    else
+#endif
+#if defined(HAVE_FIPS) && FIPS_VERSION3_LT(7,0,0)
+    {
+        if (ret != 0)
+            ERROR_OUT(WC_TEST_RET_ENC_EC(ret), done);
     }
+#else
+    {
+        if (ret == 0) {
+            ERROR_OUT(WC_TEST_RET_ENC_EC(ret), done);
+        }
+        else {
+            /* reset ret value, was expecting a failure */
+            ret = 0;
+        }
+    }
+#endif
     TEST_SLEEP();
 
 #ifdef HAVE_ECC_VERIFY
@@ -36446,15 +36463,36 @@ static wc_test_ret_t ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerif
             ret = wc_ecc_verify_hash(sig, x, digest, ECC_DIGEST_SIZE,
                                                            &verify, userA);
     } while (ret == WC_NO_ERR_TRACE(WC_PENDING_E));
-    if (ret == 0) {
-        ERROR_OUT(WC_TEST_RET_ENC_EC(ret), done);
+#ifdef WOLFSSL_SM2
+    if (curve_id == ECC_SM2P256V1) {
+        /* SM2 zero-hash sign succeeded, so verify should succeed too */
+        if (ret != 0)
+            ERROR_OUT(WC_TEST_RET_ENC_EC(ret), done);
+        if (verify != 1)
+            ERROR_OUT(WC_TEST_RET_ENC_NC, done);
     }
-    else {
-        /* reset ret value, was expecting a failure */
-        ret = 0;
+    else
+#endif
+#if defined(HAVE_FIPS) && FIPS_VERSION3_LT(7,0,0)
+    {
+        if (ret != 0)
+            ERROR_OUT(WC_TEST_RET_ENC_EC(ret), done);
+        if (verify != 1)
+            ERROR_OUT(WC_TEST_RET_ENC_NC, done);
     }
-    if (verify == 1)
-        ERROR_OUT(WC_TEST_RET_ENC_NC, done);
+#else
+    {
+        if (ret == 0) {
+            ERROR_OUT(WC_TEST_RET_ENC_EC(ret), done);
+        }
+        else {
+            /* reset ret value, was expecting a failure */
+            ret = 0;
+        }
+        if (verify == 1)
+            ERROR_OUT(WC_TEST_RET_ENC_NC, done);
+    }
+#endif
     TEST_SLEEP();
 #endif /* HAVE_ECC_VERIFY */