Move devId from crypto context into server context

Author: AlexLanzano

benchmark/wh_bench.c

@@ -1047,9 +1047,7 @@ int wh_Bench_ClientServer_Posix(int transport, int moduleIndex)
 
 #ifndef WOLFHSM_CFG_NO_CRYPTO
     /* Crypto context */
-    whServerCryptoContext crypto[1] = {{
-        .devId = INVALID_DEVID,
-    }};
+    whServerCryptoContext crypto[1] = {0};
 #endif
 
     /* Set up server configuration with NVM and crypto */
@@ -1085,7 +1083,7 @@ int wh_Bench_ClientServer_Posix(int transport, int moduleIndex)
     }
 
     /* Initialize RNG */
-    ret = wc_InitRng_ex(crypto->rng, NULL, crypto->devId);
+    ret = wc_InitRng_ex(crypto->rng, NULL, INVALID_DEVID);
     if (ret != 0) {
         WH_BENCH_PRINTF("Failed to initialize RNG: %d\n", ret);
         wolfCrypt_Cleanup();

docs/draft/crypto_affinity.md

@@ -122,8 +122,8 @@ When affinity is set:
 
 | Affinity | Server Action |
 |----------|---------------|
-| `WH_CRYPTO_AFFINITY_SW` | `server->crypto->devId = INVALID_DEVID` (wolfCrypt uses software) |
-| `WH_CRYPTO_AFFINITY_HW` | `server->crypto->devId = server->crypto->defaultDevId` (wolfCrypt uses registered crypto callback) |
+| `WH_CRYPTO_AFFINITY_SW` | `server->devId = INVALID_DEVID` (wolfCrypt uses software) |
+| `WH_CRYPTO_AFFINITY_HW` | `server->devId = server->defaultDevId` (wolfCrypt uses registered crypto callback) |
 
 When affinity is queried (Get), the server reads the current `devId` and returns the corresponding affinity value without modifying any state.
 

docs/src-ja/chapter03.md

@@ -171,15 +171,14 @@ whNvmContext nvmCtx = {0};
 wh_Nvm_Init(&nvmCtx, &whNvmConfig);
 
 /* 手順3: 暗号コンテキスト構造体の割り当てと初期化 */
-whServerCryptoContext cryptoCtx {
-   .devID = INVALID_DEVID; /* あるいは、カスタム暗号コールバックdevIDを設定 */
-};
+whServerCryptoContext cryptoCtx = {0};
 
 /* サーバー設定の割り当てと初期化 */
 whServerConfig serverCfg = {
        .comm   = commServerCfg,
        .nvm    = nvmCtx,
-       .crypto = cryptoCtx,
+       .crypto = &cryptoCtx,
+       .devId  = INVALID_DEVID, /* あるいは、カスタム暗号コールバックdevIDを設定 */
 };
 
 /* 手順4: wolfCryptの初期化 */

docs/src/chapter03.md

@@ -169,15 +169,14 @@ whNvmContext nvmCtx = {0};
 wh_Nvm_Init(&nvmCtx, &whNvmConfig);
 
 /* Step 3: Allocate and initialize a crypto context structure */
-whServerCryptoContext cryptoCtx {
-    .devID = INVALID_DEVID; /* or set to custom crypto callback devID */
-};
+whServerCryptoContext cryptoCtx = {0};
 
 /* Allocate and initialize the Server configuration*/
 whServerConfig serverCfg = {
         .comm   = commServerCfg,
         .nvm    = nvmCtx,
-        .crypto = cryptoCtx,
+        .crypto = &cryptoCtx,
+        .devId  = INVALID_DEVID, /* or set to custom crypto callback devID */
 };
 
 /* Step 4: Initialize wolfCrypt*/

examples/posix/wh_posix_server/wh_posix_server.c

@@ -416,9 +416,7 @@ int main(int argc, char** argv)
     }
 #if !defined(WOLFHSM_CFG_NO_CRYPTO)
     /* Crypto context */
-    whServerCryptoContext crypto[1] = {{
-        .devId = INVALID_DEVID,
-    }};
+    whServerCryptoContext crypto[1] = {0};
 
 #if defined(WOLFHSM_CFG_SHE_EXTENSION)
     whServerSheContext she[1] = {{0}};
@@ -452,11 +450,11 @@ int main(int argc, char** argv)
     wh_Utils_Hexdump("Context 4: Server HW RNG:\n", buffer, sizeof(buffer));
 
     /* Context 5: Set default server crypto to use cryptocb */
-    crypto->devId = HW_DEV_ID;
+    s_conf->devId = HW_DEV_ID;
     WOLFHSM_CFG_PRINTF("Context 5: Setting up default server crypto with devId=%d\n",
-           crypto->devId);
+           s_conf->devId);
 
-    rc = wc_InitRng_ex(crypto->rng, NULL, crypto->devId);
+    rc = wc_InitRng_ex(crypto->rng, NULL, s_conf->devId);
     if (rc != 0) {
         WOLFHSM_CFG_PRINTF("Failed to wc_InitRng_ex: %d\n", rc);
         return rc;

src/wh_server.c

@@ -78,10 +78,8 @@ int wh_Server_Init(whServerContext* server, whServerConfig* config)
 
 #ifndef WOLFHSM_CFG_NO_CRYPTO
     server->crypto = config->crypto;
-    if (server->crypto != NULL) {
-        server->crypto->devId = config->devId;
-        server->crypto->defaultDevId = config->devId;
-    }
+    server->devId        = config->devId;
+    server->defaultDevId = config->devId;
 #ifdef WOLFHSM_CFG_SHE_EXTENSION
     server->she = config->she;
 #endif
@@ -268,15 +266,15 @@ static int _wh_Server_HandleCommRequest(whServerContext* server,
         }
         else {
             if (req.affinity == WH_CRYPTO_AFFINITY_SW) {
-                server->crypto->devId = INVALID_DEVID;
+                server->devId = INVALID_DEVID;
                 resp.rc               = WH_ERROR_OK;
             }
             else if (req.affinity == WH_CRYPTO_AFFINITY_HW) {
                 /* If the devId the server was configured with is valid then
                  * switch back to it. The devId is used to call the appropriate
                  * callback to utilize HW crypto */
-                if (server->crypto->defaultDevId != INVALID_DEVID) {
-                    server->crypto->devId = server->crypto->defaultDevId;
+                if (server->defaultDevId != INVALID_DEVID) {
+                    server->devId = server->defaultDevId;
                     resp.rc               = WH_ERROR_OK;
                 }
                 /* If the server was not configured with a valid devId
@@ -289,7 +287,7 @@ static int _wh_Server_HandleCommRequest(whServerContext* server,
             else {
                 resp.rc = WH_ERROR_BADARGS;
             }
-            resp.affinity = (server->crypto->devId == INVALID_DEVID)
+            resp.affinity = (server->devId == INVALID_DEVID)
                                 ? WH_CRYPTO_AFFINITY_SW
                                 : WH_CRYPTO_AFFINITY_HW;
         }
@@ -313,7 +311,7 @@ static int _wh_Server_HandleCommRequest(whServerContext* server,
         }
         else {
             resp.rc       = WH_ERROR_OK;
-            resp.affinity = (server->crypto->devId == INVALID_DEVID)
+            resp.affinity = (server->devId == INVALID_DEVID)
                                 ? WH_CRYPTO_AFFINITY_SW
                                 : WH_CRYPTO_AFFINITY_HW;
         }