From 952a9b34978e2546068af2729e0843c0d648a2b3 Mon Sep 17 00:00:00 2001
From: TakayukiMatsuo <tak@wolfssl.com>
Date: Thu, 25 Mar 2021 19:02:13 +0900
Subject: [PATCH 1/2] Add unit tests for CONT_modules_xxx,
 CRYPTO_set_dynlock_xxx, CRYPTO_THREADID_xxx and ENGINE_cleanup.

---
 tests/api.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/tests/api.c b/tests/api.c
index f869f27af..05f2214f1 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -40479,6 +40479,72 @@ static void test_stubs_are_stubs()
 #endif /* OPENSSL_EXTRA && !NO_WOLFSSL_STUB */
 }
 
+
+static void test_CONF_modules_xxx(void)
+{
+#if defined(OPENSSL_EXTRA)
+    CONF_modules_free();
+    AssertTrue(1);   /* to confirm previous call gives no harm */
+
+    CONF_modules_unload(0);
+    AssertTrue(1);
+
+    CONF_modules_unload(1);
+    AssertTrue(1);
+
+    CONF_modules_unload(-1);
+    AssertTrue(1);
+
+#endif /* OPENSSL_EXTRA */
+}
+static void test_CRYPTO_set_dynlock_xxx(void)
+{
+#if defined(OPENSSL_EXTRA)
+    printf(testingFmt, "CRYPTO_set_dynlock_xxx()");
+
+    CRYPTO_set_dynlock_create_callback(
+        (struct CRYPTO_dynlock_value *(*)(const char*, int))NULL);
+
+    CRYPTO_set_dynlock_create_callback(
+        (struct CRYPTO_dynlock_value *(*)(const char*, int))1);
+
+    CRYPTO_set_dynlock_destroy_callback(
+        (void (*)(struct CRYPTO_dynlock_value*, const char*, int))NULL);
+
+    CRYPTO_set_dynlock_destroy_callback(
+        (void (*)(struct CRYPTO_dynlock_value*, const char*, int))1);
+
+    CRYPTO_set_dynlock_lock_callback(
+        (void (*)(int, struct CRYPTO_dynlock_value *, const char*, int))NULL);
+
+    CRYPTO_set_dynlock_lock_callback(
+        (void (*)(int, struct CRYPTO_dynlock_value *, const char*, int))1);
+
+    AssertTrue(1);   /* to confirm previous call gives no harm */
+    printf(resultFmt, passed);
+#endif /* OPENSSL_EXTRA */
+}
+static void test_CRYPTO_THREADID_xxx(void)
+{
+#if defined(OPENSSL_EXTRA)
+    printf(testingFmt, "CRYPTO_THREADID_xxx()");
+
+    CRYPTO_THREADID_current((CRYPTO_THREADID*)NULL);
+    CRYPTO_THREADID_current((CRYPTO_THREADID*)1);
+    AssertIntEQ(CRYPTO_THREADID_hash((const CRYPTO_THREADID*)NULL), 0);
+    printf(resultFmt, passed);
+#endif /* OPENSSL_EXTRA */
+}
+static void test_ENGINE_cleanup(void)
+{
+#if defined(OPENSSL_EXTRA)
+    printf(testingFmt, "ENGINE_cleanup()");
+    ENGINE_cleanup();
+    AssertTrue(1);   /* to confirm previous call gives no harm */
+    printf(resultFmt, passed);
+#endif /* OPENSSL_EXTRA */
+}
+
 static void test_wolfSSL_CTX_LoadCRL()
 {
 #ifdef HAVE_CRL
@@ -41285,6 +41351,11 @@ void ApiTest(void)
     test_wolfSSL_RSA_padding_add_PKCS1_PSS();
 #endif    
 
+    test_CONF_modules_xxx();
+    test_CRYPTO_set_dynlock_xxx();
+    test_CRYPTO_THREADID_xxx();
+    test_ENGINE_cleanup();
+
 #if defined(OPENSSL_ALL)
     test_wolfSSL_X509_PUBKEY_get();
     test_wolfSSL_sk_CIPHER_description();

From 79837eeb8e4c4d5656beae9d37e575859629fb64 Mon Sep 17 00:00:00 2001
From: TakayukiMatsuo <tak@wolfssl.com>
Date: Fri, 26 Mar 2021 04:30:36 +0900
Subject: [PATCH 2/2] Changed the function name to be called in the unit test
 to the OpeSSL function name.

---
 tests/api.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/api.c b/tests/api.c
index 75a6a2c6e..0750a4a3d 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -41925,11 +41925,11 @@ static int test_wolfSSL_CTX_set_ecdh_auto(void)
     int ret = 0;
     WOLFSSL_CTX* ctx = NULL;
 #if defined(OPENSSL_EXTRA)
-    printf(testingFmt, "wolfSSL_CTX_set_ecdh_auto");
-    AssertIntEQ( wolfSSL_CTX_set_ecdh_auto(NULL,0),1);
-    AssertIntEQ( wolfSSL_CTX_set_ecdh_auto(NULL,1),1);
-    AssertIntEQ( wolfSSL_CTX_set_ecdh_auto(ctx,0),1);
-    AssertIntEQ( wolfSSL_CTX_set_ecdh_auto(ctx,1),1);
+    printf(testingFmt, "SSL_CTX_set_ecdh_auto");
+    AssertIntEQ( SSL_CTX_set_ecdh_auto(NULL,0),1);
+    AssertIntEQ( SSL_CTX_set_ecdh_auto(NULL,1),1);
+    AssertIntEQ( SSL_CTX_set_ecdh_auto(ctx,0),1);
+    AssertIntEQ( SSL_CTX_set_ecdh_auto(ctx,1),1);
     printf(resultFmt, passed);
 #endif /* OPENSSL_EXTRA */
     (void)ctx;