Update Makefiles and settings for WOLFHSM_CFG_DEBUG migration

Author: jackctj117

benchmark/Makefile

@@ -90,11 +90,11 @@ ifeq ($(DEBUG_WOLFSSL),1)
 endif
 
 ifeq ($(DEBUG_CRYPTOCB),1)
-	DEF += -DDEBUG_CRYPTOCB
+	DEF += -DWOLFHSM_CFG_DEBUG
 endif
 
 ifeq ($(DEBUG_CRYPTOCB_VERBOSE),1)
-	DEF += -DDEBUG_CRYPTOCB -DDEBUG_CRYPTOCB_VERBOSE
+	DEF += -DWOLFHSM_CFG_DEBUG -DWOLFHSM_CFG_DEBUG_VERBOSE
 endif
 
 

benchmark/config/user_settings.h

@@ -35,8 +35,8 @@ extern "C" {
 /* #define WC_NO_ASYNC_THREADING */
 
 /*
-#define DEBUG_CRYPTOCB
-#define DEBUG_CRYPTOCB_VERBOSE
+#define WOLFHSM_CFG_DEBUG
+#define WOLFHSM_CFG_DEBUG_VERBOSE
 */
 
 /** wolfHSM required settings for wolfCrypt */

examples/posix/wh_posix_client/user_settings.h

@@ -8,8 +8,8 @@
 #define HAVE_ANONYMOUS_INLINE_AGGREGATES 1
 /* Optional if debugging cryptocb's */
 #if 0
-#define DEBUG_CRYPTOCB
-#define DEBUG_CRYPTOCB_VERBOSE
+#define WOLFHSM_CFG_DEBUG
+#define WOLFHSM_CFG_DEBUG_VERBOSE
 #endif
 
 /* Key DER export/import support */

src/wh_server_crypto.c

@@ -2929,10 +2929,8 @@ static int _HandleMlDsaKeyGen(whServerContext* ctx, uint16_t magic,
                             ret = wh_Server_MlDsaKeyCacheImport(
                                 ctx, key, key_id, flags, label_size, label);
                         }
-#ifdef WOLFHSM_CFG_DEBUG
                         WH_DEBUG_SERVER("CacheImport: keyId:%u, ret:%d\n",
                                key_id, ret);
-#endif
                     }
                 }
             }
@@ -3216,12 +3214,10 @@ int wh_Server_HandleCryptoRequest(whServerContext* ctx, uint16_t magic,
         magic, (whMessageCrypto_GenericRequestHeader*)req_packet, &rqstHeader);
 
 
-#ifdef WOLFHSM_CFG_DEBUG
     WH_DEBUG_SERVER_VERBOSE("HandleCryptoRequest. Action:%u\n", action);
 #ifdef WOLFHSM_CFG_HEXDUMP
     wh_Utils_Hexdump("[server] Crypto Request:\n", (const uint8_t*)req_packet,
                      req_size);
-#endif
 #endif
     switch (action) {
         case WC_ALGO_TYPE_CIPHER:
@@ -3484,9 +3480,7 @@ int wh_Server_HandleCryptoRequest(whServerContext* ctx, uint16_t magic,
             sizeof(whMessageCrypto_GenericResponseHeader) + cryptoOutSize;
     }
 
-#ifdef WOLFHSM_CFG_DEBUG
     WH_DEBUG_SERVER_VERBOSE("End ret:%d\n", ret);
-#endif
 
     /* Since crypto error codes are propagated to the client in the response
      * packet, return success to the caller unless a cancellation has occurred

test/Makefile

@@ -89,11 +89,11 @@ ifeq ($(DEBUG_WOLFSSL),1)
 endif
 
 ifeq ($(DEBUG_CRYPTOCB),1)
-	DEF += -DDEBUG_CRYPTOCB
+	DEF += -DWOLFHSM_CFG_DEBUG
 endif
 
 ifeq ($(DEBUG_CRYPTOCB_VERBOSE),1)
-	DEF += -DDEBUG_CRYPTOCB -DDEBUG_CRYPTOCB_VERBOSE
+	DEF += -DWOLFHSM_CFG_DEBUG -DWOLFHSM_CFG_DEBUG_VERBOSE
 endif
 
 

test/config/user_settings.h

@@ -31,8 +31,8 @@
 /* #define WC_NO_ASYNC_THREADING */
 
 /*
-#define DEBUG_CRYPTOCB
-#define DEBUG_CRYPTOCB_VERBOSE
+#define WOLFHSM_CFG_DEBUG
+#define WOLFHSM_CFG_DEBUG_VERBOSE
 */
 
 /** wolfHSM required settings for wolfCrypt */

tools/whnvmtool/user_settings.h

@@ -35,8 +35,8 @@ extern "C" {
 /* #define WC_NO_ASYNC_THREADING */
 
 /*
-#define DEBUG_CRYPTOCB
-#define DEBUG_CRYPTOCB_VERBOSE
+#define WOLFHSM_CFG_DEBUG
+#define WOLFHSM_CFG_DEBUG_VERBOSE
 */
 
 /** wolfHSM required settings for wolfCrypt */

wolfhsm/wh_settings.h

@@ -235,7 +235,7 @@
  * Debug and Print Configuration
  *---------------------------------------------------------------------------*/
 
-/* Legacy compatibility: Map DEBUG_CRYPTOCB to WOLFHSM_CFG_DEBUG for transition */
+/* Legacy compatibility: Bidirectional mapping for transition */
 #if defined(DEBUG_CRYPTOCB) && !defined(WOLFHSM_CFG_DEBUG)
     #define WOLFHSM_CFG_DEBUG
 #endif
@@ -244,6 +244,15 @@
     #define WOLFHSM_CFG_DEBUG_VERBOSE
 #endif
 
+/* Reverse mapping: Allow new macros to work with wolfSSL's DEBUG_CRYPTOCB features */
+#if defined(WOLFHSM_CFG_DEBUG) && !defined(DEBUG_CRYPTOCB)
+    #define DEBUG_CRYPTOCB
+#endif
+
+#if defined(WOLFHSM_CFG_DEBUG_VERBOSE) && !defined(DEBUG_CRYPTOCB_VERBOSE)
+    #define DEBUG_CRYPTOCB_VERBOSE
+#endif
+
 /* User can define WOLFHSM_CFG_PRINTF to override the default printf function.
  * This should be a function-like macro or function pointer that matches:
  * int func(const char* format, ...)