stm32h5-tz-wolfhsm: bind NSC transport via WH_TRANSPORT_NSC_*_CB macros

Author: aidangarske

port/stmicro/stm32h5-tz-wolfhsm/README.md

@@ -451,7 +451,7 @@ the comments at the top to see exactly what the client side has to do:
 
 1. Allocate a static `whTransportNscClientContext`.
 2. Fill in `whCommClientConfig` with the NSC transport callbacks
-   (`whTransportNscClient_Cb` from
+   (`WH_TRANSPORT_NSC_CLIENT_CB` from
    `lib/wolfHSM/port/armv8m-tz/wh_transport_nsc.h`).
 3. Wrap that in a `whClientConfig`.
 4. Call `whTest_ClientConfig(&clientCfg)` (from wolfHSM's test

port/stmicro/stm32h5-tz-wolfhsm/demo-app/main.c

@@ -83,13 +83,14 @@ static int wolfhsm_demo_run(void)
     whCommClientConfig comm;
     whClientConfig     cfg;
     int                rc;
+    static const whTransportClientCb nsc_cb = WH_TRANSPORT_NSC_CLIENT_CB;
 
     memset(&s_nsc_ctx, 0, sizeof(s_nsc_ctx));
     memset(&s_nsc_cfg, 0, sizeof(s_nsc_cfg));
     memset(&comm,     0, sizeof(comm));
     memset(&cfg,      0, sizeof(cfg));
 
-    comm.transport_cb      = &whTransportNscClient_Cb;
+    comm.transport_cb      = &nsc_cb;
     comm.transport_context = &s_nsc_ctx;
     comm.transport_config  = &s_nsc_cfg;
     comm.client_id         = WOLFHSM_DEMO_CLIENT_ID;

src/wolfhsm_callable.c

@@ -72,9 +72,10 @@ static whNvmConfig               g_nvm_cfg = {
 static whServerCryptoContext     g_crypto_ctx;
 static whTransportNscServerContext g_srv_tx_ctx;
 static whTransportNscServerConfig g_srv_tx_cfg = { 0 };
+static const whTransportServerCb g_srv_tx_cb = WH_TRANSPORT_NSC_SERVER_CB;
 static whCommServerConfig        g_comm_cfg = {
     .transport_context = &g_srv_tx_ctx,
-    .transport_cb      = &whTransportNscServer_Cb,
+    .transport_cb      = &g_srv_tx_cb,
     .transport_config  = &g_srv_tx_cfg,
     .server_id         = WCS_WOLFHSM_SERVER_ID,
 };

test-app/wcs/wolfhsm_test.c

@@ -35,14 +35,15 @@ extern whTransportNscClientContext g_wolfhsm_nsc_client_ctx;
 int cmd_wolfhsm_test(const char *args)
 {
     static const whTransportNscClientConfig nsc_cfg = { 0 };
+    static const whTransportClientCb nsc_cb = WH_TRANSPORT_NSC_CLIENT_CB;
     whCommClientConfig comm_cfg;
     whClientConfig     cfg;
     int rc;
 
     (void)args;
 
     memset(&comm_cfg, 0, sizeof(comm_cfg));
-    comm_cfg.transport_cb      = &whTransportNscClient_Cb;
+    comm_cfg.transport_cb      = &nsc_cb;
     comm_cfg.transport_context = &g_wolfhsm_nsc_client_ctx;
     comm_cfg.transport_config  = &nsc_cfg;
     comm_cfg.client_id         = WCS_WOLFHSM_CLIENT_ID;