Use file macros from wc_port.h, minor updates after testing

Author: padelsbach

include/wolfprovider/wp_logging.h

@@ -237,12 +237,10 @@ int wolfProv_SetLogLevel(int levelMask);
 /* Set which components are logged, bitmask of wolfProv_LogComponents */
 int wolfProv_SetLogComponents(int componentMask);
 
-#ifdef WOLFPROV_LOG_FILE
 /* Initialize the logging system for file based logging */
 int wp_log_file_init(void);
 /* Cleanup the logging system for file based logging */
 void wp_log_file_cleanup(void);
-#endif /* WOLFPROV_LOG_FILE */
 
 #ifdef WOLFPROV_DEBUG
 

scripts/build-wolfprovider.sh

@@ -9,8 +9,8 @@ show_help() {
   echo "  --help, -help, -h          Display this help menu and exit"
   echo "  --clean                    Run make clean in OpenSSL, wolfSSL, and wolfProvider"
   echo "  --distclean                Remove source and install directories of OpenSSL, wolfSSL, and wolfProvider"
-  echo "  --debug                    Builds OpenSSL, wolfSSL, and WolfProvider with debugging enabled. This is the same as setting WOLFPROV_DEBUG=1"
-  echo "  --debug-log=FILE           Force all wolfProvider debug output to specified log file instead of stderr/stdout (FILE = path to log file you want to use)"
+  echo "  --debug                    Builds OpenSSL, wolfSSL, and WolfProvider in debug mode with logging enabled. This is the same as setting WOLFPROV_DEBUG=1"
+  echo "  --debug-log=FILE           Force all wolfProvider runtime output to specified log file instead of stderr/stdout (FILE = path to log file you want to use). Logs are appended to existing file."
   echo "  --debug-asn-template       Enable debug information for asn within wolfSSL"
   echo "  --disable-err-trace        No debug trace messages from library errors in wolfSSL"
   echo "  --openssl-ver=VER          Which version of OpenSSL to clone"
@@ -140,6 +140,11 @@ if [ "${WOLFPROV_LEAVE_SILENT}" = "1" ] && [ -z "$WOLFPROV_DEBUG" ] && [ -z "$de
     exit 1
 fi
 
+if [ -n "$WOLFPROV_LOG_FILE" ] && [ -z "$WOLFPROV_DEBUG" ]; then
+    echo "Error: --debug-log requires --debug to be set."
+    exit 1
+fi
+
 if [ -n "$build_debian" ]; then
     echo "Building Debian package..."
     WOLFSSL_ISFIPS=${WOLFSSL_ISFIPS:-0} WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0} ./scripts/build-debian.sh

src/wp_logging.c

@@ -51,33 +51,34 @@ static int providerLogComponents = WP_LOG_COMPONENTS_ALL;
 
 #ifdef WOLFPROV_LOG_FILE
 /* Persistent file handle for logging to file */
-static FILE* logFileHandle = NULL;
-/* Flag to track if we've already reported file open failure to avoid spam */
-static int logFileErrorReported = 0;
+static XFILE* logFileHandle = NULL;
 #endif
 
 #endif /* WOLFPROV_DEBUG */
 
-#ifdef WOLFPROV_LOG_FILE
 /**
  * Initialize the persistent log file handle.
  * Called once during provider initialization.
  *
  * @return 0 on success, negative value on failure.
  */
+
 int wp_log_file_init(void)
 {
+#if defined(WOLFPROV_LOG_FILE) && defined(WOLFPROV_DEBUG)
     if (logFileHandle == NULL) {
-        fprintf(stderr, "wolfProvider: Opening log file %s\n", WOLFPROV_LOG_FILE);
-        logFileHandle = fopen(WOLFPROV_LOG_FILE, "a");
-        fprintf(stderr, "wolfProvider: Log file handle: %p\n", logFileHandle);
-        if (logFileHandle == NULL) {
+        logFileHandle = XFOPEN(WOLFPROV_LOG_FILE, "a");
+        if (logFileHandle) {
+            XFPRINTF(stderr, "wolfProvider: Using log file %s\n", WOLFPROV_LOG_FILE);
+            fflush(stderr);
+        }
+        else  {
             /* File open failed - will fall back to stderr on first log */
-            fprintf(stderr, "wolfProvider: Failed to open log file %s\n", WOLFPROV_LOG_FILE);
+            XFPRINTF(stderr, "wolfProvider: Failed to open log file %s\n", WOLFPROV_LOG_FILE);
             return -1;
         }
     }
-    
+#endif /* WOLFPROV_LOG_FILE && WOLFPROV_DEBUG */
     return 0;
 }
 
@@ -87,13 +88,14 @@ int wp_log_file_init(void)
  */
 void wp_log_file_cleanup(void)
 {
+#if defined(WOLFPROV_LOG_FILE) && defined(WOLFPROV_DEBUG)
     if (logFileHandle != NULL) {
-        fprintf(stderr, "wolfProvider: Closing log file %s\n", WOLFPROV_LOG_FILE);
-        fclose(logFileHandle);
+        XFPRINTF(stderr, "wolfProvider: Closing log file %s\n", WOLFPROV_LOG_FILE);
+        XFCLOSE(logFileHandle);
         logFileHandle = NULL;
     }
+#endif /* WOLFPROV_LOG_FILE && WOLFPROV_DEBUG */
 }
-#endif /* WOLFPROV_LOG_FILE */
 
 /**
  * Registers wolfProv logging callback.
@@ -218,23 +220,27 @@ static void wolfprovider_log(const int logLevel, const int component,
         printf("%s\n", logMessage);
 #elif defined(WOLFPROV_LOG_FILE)
         {
+            /* Flag to track if we've already reported file open failure to avoid spam */
+            static int logFileErrorReported = 0;
+
             if (logFileHandle != NULL) {
-                fprintf(stderr, "wolfProvider: Logging to file %s\n", WOLFPROV_LOG_FILE);
-                fprintf(logFileHandle, "%s\n", logMessage);
-                fflush(logFileHandle);
+                XFWRITE(logMessage, strlen(logMessage), 1, logFileHandle);
+                XFWRITE("\n", 1, 1, logFileHandle);
+                XFFLUSH(logFileHandle);
             } else {
                 /* Only report file error once to avoid spam */
                 if (!logFileErrorReported) {
-                    fprintf(stderr, "wolfProvider: Failed to open log file %s, "
+                    XFPRINTF(stderr, "wolfProvider: Log file not open: %s, "
                             "falling back to stderr\n", 
                         WOLFPROV_LOG_FILE);
                     logFileErrorReported = 1;
                 }
-                fprintf(stderr, "%s\n", logMessage);
+                XFWRITE(logMessage, strlen(logMessage), 1, stderr);
+                XFWRITE("\n", 1, 1, stderr);
             }
         }
 #else
-        fprintf(stderr, "%s\n", logMessage);
+        XFPRINTF(stderr, "%s\n", logMessage);
 #endif
     }
 }

src/wp_wolfprov.c

@@ -1178,10 +1178,7 @@ static const OSSL_ALGORITHM* wolfprov_query(void* provCtx, int id,
  */
 static void wolfprov_teardown(void* provCtx)
 {
-#ifdef WOLFPROV_LOG_FILE
-    /* Cleanup logging system */
     wp_log_file_cleanup();
-#endif
     wolfssl_prov_ctx_free(provCtx);
 }
 
@@ -1239,6 +1236,8 @@ int wolfssl_provider_init(const OSSL_CORE_HANDLE* handle,
 {
     int ok = 1;
 
+    wp_log_file_init();
+
     WOLFPROV_ENTER(WP_LOG_PROVIDER, "wolfssl_provider_init");
 
 #ifdef WOLFPROV_DEBUG
@@ -1254,16 +1253,6 @@ int wolfssl_provider_init(const OSSL_CORE_HANDLE* handle,
             wolfSSL_SetLoggingPrefix("wolfSSL");
         }
     }
-    
-#ifdef WOLFPROV_LOG_FILE
-    /* Initialize logging system for file based logging */
-    if (ok) {
-        if (wp_log_file_init() != 0) {
-            /* Logging init failure is not fatal, but log it */
-            fprintf(stderr, "wolfProvider: Warning - Failed to initialize file logging\n");
-        }
-    }
-#endif
 #endif
 
 #ifdef HAVE_FIPS