From 1ae9e85d415b2595471c48848780eb0e91f7ba84 Mon Sep 17 00:00:00 2001
From: Colton Willey <colton@wolfssl.com>
Date: Thu, 5 Jun 2025 12:36:39 -0700
Subject: [PATCH 1/2] Allow wolfProvider to be built with debug when wolfSSL is
 not built with debug

---
 src/wp_wolfprov.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/wp_wolfprov.c b/src/wp_wolfprov.c
index 4e458ba6..f794f59a 100644
--- a/src/wp_wolfprov.c
+++ b/src/wp_wolfprov.c
@@ -1191,8 +1191,17 @@ int wolfssl_provider_init(const OSSL_CORE_HANDLE* handle,
     OSSL_FUNC_core_get_libctx_fn* c_get_libctx = NULL;
 
 #ifdef WOLFPROV_DEBUG
-    ok = (wolfProv_Debugging_ON() == 0) && (wolfSSL_Debugging_ON() == 0);
-    wolfSSL_SetLoggingPrefix("wolfSSL");
+    ok = (wolfProv_Debugging_ON() == 0);
+    if (ok) {
+      if (wolfSSL_Debugging_ON() != 0) {
+        WOLFPROV_MSG(WP_LOG_PROVIDER,
+          "WARNING: wolfProvider built with debug but underlying wolfSSL is not!"
+          "Building wolfSSl with debug is highly recommended, proceeding...");
+      }
+      else {
+        wolfSSL_SetLoggingPrefix("wolfSSL");
+      }
+    }
 #endif
 
 #ifdef HAVE_FIPS

From 0d1ed2e6bb5cbcd1b3a496c7ab405fd1668880da Mon Sep 17 00:00:00 2001
From: Colton Willey <colton@wolfssl.com>
Date: Mon, 9 Jun 2025 11:48:06 -0700
Subject: [PATCH 2/2] Fix spacing issue in wolfprov init

---
 src/wp_wolfprov.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/wp_wolfprov.c b/src/wp_wolfprov.c
index f794f59a..55b47b5d 100644
--- a/src/wp_wolfprov.c
+++ b/src/wp_wolfprov.c
@@ -1193,14 +1193,14 @@ int wolfssl_provider_init(const OSSL_CORE_HANDLE* handle,
 #ifdef WOLFPROV_DEBUG
     ok = (wolfProv_Debugging_ON() == 0);
     if (ok) {
-      if (wolfSSL_Debugging_ON() != 0) {
-        WOLFPROV_MSG(WP_LOG_PROVIDER,
-          "WARNING: wolfProvider built with debug but underlying wolfSSL is not!"
-          "Building wolfSSl with debug is highly recommended, proceeding...");
-      }
-      else {
-        wolfSSL_SetLoggingPrefix("wolfSSL");
-      }
+        if (wolfSSL_Debugging_ON() != 0) {
+            WOLFPROV_MSG(WP_LOG_PROVIDER,
+              "WARNING: wolfProvider built with debug but underlying wolfSSL is not!"
+              "Building wolfSSl with debug is highly recommended, proceeding...");
+        }
+        else {
+            wolfSSL_SetLoggingPrefix("wolfSSL");
+        }
     }
 #endif
 
@@ -1213,8 +1213,8 @@ int wolfssl_provider_init(const OSSL_CORE_HANDLE* handle,
 #if defined(XGETENV) && !defined(NO_GETENV)
     forceFailEnv = XGETENV("WOLFPROV_FORCE_FAIL");
     if (forceFailEnv != NULL && XATOI(forceFailEnv) == 1) {
-      WOLFPROV_MSG(WP_LOG_PROVIDER, "WOLFPROV_FORCE_FAIL=1, Forcing failure\n");
-      forceFail = 1;
+        WOLFPROV_MSG(WP_LOG_PROVIDER, "WOLFPROV_FORCE_FAIL=1, Forcing failure\n");
+        forceFail = 1;
     }
 #else
 #error "Force failure check enabled but impossible to perform without XGETENV, use -DWP_NO_FORCE_FAIL"