Fix debug calls for runtime loading

Now that the tests have a verbose mode, the debug calls need to be
loaded in at runtime for non-static builds.

Author: LinuxJedi

tests/debug_test.c

@@ -41,8 +41,13 @@
 
 #ifndef HAVE_PKCS11_STATIC
 #include <dlfcn.h>
+static void* dlib = NULL;
+void (*wolfPKCS11_Debugging_On_fp)(void) = NULL;
+void (*wolfPKCS11_Debugging_Off_fp)(void) = NULL;
 #endif
 
+static CK_FUNCTION_LIST_PTR pFunctionList = NULL;
+
 #ifdef DEBUG_WOLFPKCS11
 static FILE* original_stdout = NULL;
 static FILE* capture_file = NULL;
@@ -80,6 +85,67 @@ static int check_debug_output(void)
     fclose(capture_file);
     return found_debug;
 }
+
+/* Wrapper functions for debugging */
+static void call_wolfPKCS11_Debugging_On(void) {
+#ifndef HAVE_PKCS11_STATIC
+    if (wolfPKCS11_Debugging_On_fp != NULL) {
+        wolfPKCS11_Debugging_On_fp();
+    }
+#else
+    wolfPKCS11_Debugging_On();
+#endif
+}
+
+static void call_wolfPKCS11_Debugging_Off(void) {
+#ifndef HAVE_PKCS11_STATIC
+    if (wolfPKCS11_Debugging_Off_fp != NULL) {
+        wolfPKCS11_Debugging_Off_fp();
+    }
+#else
+    wolfPKCS11_Debugging_Off();
+#endif
+}
+
+static CK_RV debug_init(const char* library) {
+    CK_RV ret = CKR_OK;
+#ifndef HAVE_PKCS11_STATIC
+    void* func;
+
+    dlib = dlopen(library, RTLD_NOW | RTLD_LOCAL);
+    if (dlib == NULL) {
+        fprintf(stderr, "dlopen error: %s\n", dlerror());
+        return -1;
+    }
+
+    func = (void*)(CK_C_GetFunctionList)dlsym(dlib, "C_GetFunctionList");
+    if (func == NULL) {
+        fprintf(stderr, "Failed to get function list function\n");
+        dlclose(dlib);
+        return -1;
+    }
+
+    wolfPKCS11_Debugging_On_fp = (void (*)(void))dlsym(dlib,
+                                                  "wolfPKCS11_Debugging_On");
+    wolfPKCS11_Debugging_Off_fp = (void (*)(void))dlsym(dlib,
+                                                 "wolfPKCS11_Debugging_Off");
+    
+    ret = ((CK_C_GetFunctionList)func)(&pFunctionList);
+#else
+    ret = C_GetFunctionList(&pFunctionList);
+    (void)library;
+#endif
+    return ret;
+}
+
+static void debug_cleanup(void) {
+#ifndef HAVE_PKCS11_STATIC
+    if (dlib) {
+        dlclose(dlib);
+        dlib = NULL;
+    }
+#endif
+}
 #endif
 
 int main(void)
@@ -90,8 +156,8 @@ int main(void)
     return 77;
 #else
     CK_RV rv;
-    CK_FUNCTION_LIST_PTR pFunctionList;
     int debug_found;
+    const char* library = "./src/.libs/libwolfpkcs11.so";
 
 #ifndef WOLFPKCS11_NO_ENV
     if (!XGETENV("WOLFPKCS11_TOKEN_PATH")) {
@@ -102,22 +168,27 @@ int main(void)
     printf("=== wolfPKCS11 Debug Test Program ===\n");
     printf("Debug mode is ENABLED (DEBUG_WOLFPKCS11 defined)\n");
 
+    printf("\nInitializing library:\n");
+    rv = debug_init(library);
+    if (rv != CKR_OK) {
+        printf("Failed to initialize library: %lu\n", (unsigned long)rv);
+        return 1;
+    }
+
     printf("\nTesting debug control functions:\n");
-    wolfPKCS11_Debugging_On();
+    call_wolfPKCS11_Debugging_On();
     printf("Debug enabled\n");
 
-    wolfPKCS11_Debugging_Off();
+    call_wolfPKCS11_Debugging_Off();
     printf("Debug disabled\n");
 
-    wolfPKCS11_Debugging_On();
+    call_wolfPKCS11_Debugging_On();
     printf("Debug re-enabled\n");
 
     printf("\nTesting PKCS#11 functions with debug output capture:\n");
 
     setup_output_capture();
 
-    rv = C_GetFunctionList(&pFunctionList);
-
     if (rv == CKR_OK && pFunctionList != NULL) {
         rv = pFunctionList->C_Initialize(NULL);
 
@@ -133,13 +204,15 @@ int main(void)
     printf("C_GetFunctionList returned: %lu\n", (unsigned long)rv);
     printf("Debug output detection: %s\n", debug_found ? "PASS" : "FAIL");
 
-    wolfPKCS11_Debugging_Off();
+    call_wolfPKCS11_Debugging_Off();
     printf("Debug disabled at end\n");
 
+    debug_cleanup();
     printf("\n=== Test Complete ===\n");
 
     if (!debug_found) {
-        printf("ERROR: No debug output was detected during PKCS#11 function calls\n");
+        printf("ERROR: No debug output was detected during "
+               "PKCS#11 function calls\n");
         return 1;
     }
 

tests/include.am

@@ -45,7 +45,6 @@ tests_rsa_session_persistence_test_LDADD += src/libwolfpkcs11.la
 tests_debug_test_LDADD += src/libwolfpkcs11.la
 tests_object_id_uniqueness_test_LDADD += src/libwolfpkcs11.la
 else
-tests_debug_test_LDADD += src/libwolfpkcs11.la
 tests_object_id_uniqueness_test_LDADD += src/libwolfpkcs11.la
 endif
 

tests/pkcs11test.c

@@ -64,6 +64,13 @@
 static void* dlib;
 #endif
 static CK_FUNCTION_LIST* funcList;
+
+#ifdef DEBUG_WOLFPKCS11
+#ifndef HAVE_PKCS11_STATIC
+void (*wolfPKCS11_Debugging_On_fp)(void) = NULL;
+void (*wolfPKCS11_Debugging_Off_fp)(void) = NULL;
+#endif
+#endif
 static int slot = 0;
 static const char* tokenName = "wolfpkcs11";
 
@@ -13948,6 +13955,16 @@ static CK_RV pkcs11_init(const char* library)
         }
     }
 
+#ifdef DEBUG_WOLFPKCS11
+    if (ret == CKR_OK) {
+        wolfPKCS11_Debugging_On_fp = (void (*)(void))dlsym(dlib,
+                                                     "wolfPKCS11_Debugging_On");
+        wolfPKCS11_Debugging_Off_fp = (void (*)(void))dlsym(dlib,
+                                                    "wolfPKCS11_Debugging_Off");
+        /* These functions are optional, so don't fail if they're not found */
+    }
+#endif
+
     if (ret == CKR_OK) {
         ret = ((CK_C_GetFunctionList)func)(&funcList);
         CHECK_CKR(ret, "Get Function List call");

tests/unit.h

@@ -19,6 +19,25 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
+/* Forward declarations for debugging function pointers */
+#ifdef DEBUG_WOLFPKCS11
+#ifndef HAVE_PKCS11_STATIC
+extern void (*wolfPKCS11_Debugging_On_fp)(void);
+extern void (*wolfPKCS11_Debugging_Off_fp)(void);
+#endif
+
+/* Wrapper function to handle both static and dynamic debugging calls */
+static inline void call_wolfPKCS11_Debugging_On(void) {
+#ifndef HAVE_PKCS11_STATIC
+    if (wolfPKCS11_Debugging_On_fp != NULL) {
+        wolfPKCS11_Debugging_On_fp();
+    }
+#else
+    wolfPKCS11_Debugging_On();
+#endif
+}
+#endif
+
 #ifdef DEBUG_WOLFPKCS11
 #define CHECK_COND(cond, ret, msg)                                         \
     do {                                                                   \
@@ -323,7 +342,7 @@ static CK_RV run_tests(TEST_FUNC* testFunc, int testFuncCnt, int onlySet,
 
 #ifdef DEBUG_WOLFPKCS11
     if (verbose) {
-        wolfPKCS11_Debugging_On();
+        call_wolfPKCS11_Debugging_On();
     }
 #endif