addressed code review

miyazakh · miyazakh · commit 33708db6c40e · 2025-10-29T10:27:10.000+09:00
diff --git a/benchmark/bench_modules/wh_bench_mod_aes.c b/benchmark/bench_modules/wh_bench_mod_aes.c
@@ -831,4 +831,4 @@ int wh_Bench_Mod_Aes256GCMDecryptDma(whClientContext*  client,
 
 #endif /* !defined(NO_AES) */
 
-#endif /* WOLFHSM_CFG_BENCH_ENABLE */
+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_cmac.c b/benchmark/bench_modules/wh_bench_mod_cmac.c
@@ -183,4 +183,4 @@ int wh_Bench_Mod_CmacAes256Dma(whClientContext* client, whBenchOpContext* ctx,
 
 #endif /* WOLFSSL_CMAC && !defined(NO_AES) && defined(WOLFSSL_AES_DIRECT) */
 
-#endif /* WOLFHSM_CFG_BENCH_ENABLE */
+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_curve25519.c b/benchmark/bench_modules/wh_bench_mod_curve25519.c
@@ -252,4 +252,4 @@ int wh_Bench_Mod_Curve25519SharedSecret(whClientContext*  client,
 
 #endif /* HAVE_CURVE25519 */
 
-#endif /* WOLFHSM_CFG_BENCH_ENABLE */
+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_ecc.c b/benchmark/bench_modules/wh_bench_mod_ecc.c
@@ -567,4 +567,4 @@ int wh_Bench_Mod_EccP256Ecdh(whClientContext* client, whBenchOpContext* ctx,
 
 #endif /* HAVE_ECC */
 
-#endif /* WOLFHSM_CFG_BENCH_ENABLE */
+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_hmac.c b/benchmark/bench_modules/wh_bench_mod_hmac.c
@@ -175,4 +175,4 @@ int wh_Bench_Mod_HmacSha3256Dma(whClientContext* client, whBenchOpContext* ctx,
 
 #endif /* !defined(NO_HMAC) */
 
-#endif /* WOLFHSM_CFG_BENCH_ENABLE */
+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_mldsa.c b/benchmark/bench_modules/wh_bench_mod_mldsa.c
@@ -1193,4 +1193,4 @@ int wh_Bench_Mod_MlDsa87KeyGenDma(whClientContext*  client,
 
 #endif /* HAVE_DILITHIUM */
 
-#endif /* WOLFHSM_CFG_BENCH_ENABLE */
+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_rng.c b/benchmark/bench_modules/wh_bench_mod_rng.c
@@ -94,4 +94,4 @@ int wh_Bench_Mod_Rng(whClientContext* client, whBenchOpContext* ctx, int id,
 
 #endif /* !defined(WC_NO_RNG) */
 
-#endif /* WOLFHSM_CFG_BENCH_ENABLE */
+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_rsa.c b/benchmark/bench_modules/wh_bench_mod_rsa.c
@@ -1115,4 +1115,4 @@ int wh_Bench_Mod_Rsa4096KeyGenDma(whClientContext*  client,
 
 #endif /* !(NO_RSA) */
 
-#endif /* WOLFHSM_CFG_BENCH_ENABLE */
+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_sha2.c b/benchmark/bench_modules/wh_bench_mod_sha2.c
@@ -549,4 +549,4 @@ int wh_Bench_Mod_Sha512Dma(whClientContext* client, whBenchOpContext* ctx,
 
 #endif /* WOLFSSL_SHA512 */
 
-#endif /* WOLFHSM_CFG_BENCH_ENABLE */
+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_sha3.c b/benchmark/bench_modules/wh_bench_mod_sha3.c
@@ -45,4 +45,4 @@ int wh_Bench_Mod_Sha3256Dma(whClientContext* client, whBenchOpContext* ctx,
 
 #endif /* WOLFSSL_SHA3 */
 
-#endif /* WOLFHSM_CFG_BENCH_ENABLE */
+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/examples/demo/client/wh_demo_client_secboot.c b/examples/demo/client/wh_demo_client_secboot.c
@@ -14,12 +14,12 @@
 #include "wolfhsm/wh_client_crypto.h"
 
 #if !defined(WOLFHSM_CFG_NO_CRYPTO)
+
 #include "wolfssl/wolfcrypt/settings.h"
 #include "wolfssl/wolfcrypt/ecc.h"
 #include "wolfssl/wolfcrypt/sha256.h"
 #include "wolfssl/wolfcrypt/error-crypt.h"
 #include "wh_demo_client_secboot.h"
-#endif /* !WOLFHSM_CFG_NO_CRYPTO */
 
 /* Provisioning process:
  * 1. Generate a server keypair into key cache as keyId 27
@@ -99,7 +99,6 @@ static int _showNvm(whClientContext* clientContext)
 
 static int _provisionMakeCommitKey(whClientContext* clientContext)
 {
-#ifndef WOLFHSM_CFG_NO_CRYPTO
     int ret;
 
     /* Use the default ECC curve for 32 byte key, likely P256r1 */
@@ -114,15 +113,10 @@ static int _provisionMakeCommitKey(whClientContext* clientContext)
         ret = wh_Client_KeyCommit(clientContext, prov_keyId);
     }
     return ret;
-#else
-    (void)clientContext;
-    return WH_ERROR_NOTIMPL;
-#endif
 }
 
 static int _sha256File(const char* file_to_measure, uint8_t* hash)
 {
-#ifndef WOLFHSM_CFG_NO_CRYPTO
     int ret = 0;
     int fd = open(file_to_measure, O_RDONLY);
     if (fd >= 0) {
@@ -156,17 +150,11 @@ static int _sha256File(const char* file_to_measure, uint8_t* hash)
         ret = WH_ERROR_BADARGS;
     }
     return ret;
-#else
-    (void)file_to_measure;
-    (void)hash;
-    return WH_ERROR_NOTIMPL;
-#endif
 }
 
 static int _signHash(const uint8_t* hash, size_t hash_len, uint8_t* sig,
                      uint16_t* sig_len)
 {
-#ifndef WOLFHSM_CFG_NO_CRYPTO
     ecc_key key[1];
     int ret = wc_ecc_init_ex(key, NULL, WH_DEV_ID);
     if (ret == 0) {
@@ -182,19 +170,11 @@ static int _signHash(const uint8_t* hash, size_t hash_len, uint8_t* sig,
         (void)wc_ecc_free(key);
     }
     return ret;
-#else
-    (void)hash;
-    (void)hash_len;
-    (void)sig;
-    (void)sig_len;
-    return WH_ERROR_NOTIMPL;
-#endif
 }
 
 static int _verifyHash(const uint8_t* hash, size_t hash_len, const uint8_t* sig,
                        uint16_t sig_len, int32_t* rc)
 {
-#ifndef WOLFHSM_CFG_NO_CRYPTO
     ecc_key key[1];
     int ret = wc_ecc_init_ex(key, NULL, WH_DEV_ID);
     if (ret == 0) {
@@ -210,19 +190,10 @@ static int _verifyHash(const uint8_t* hash, size_t hash_len, const uint8_t* sig,
         (void)wc_ecc_free(key);
     }
     return ret;
-#else
-    (void)hash;
-    (void)hash_len;
-    (void)sig;
-    (void)sig_len;
-    (void)rc;
-    return WH_ERROR_NOTIMPL;
-#endif
 }
 
 int wh_DemoClient_SecBoot_Provision(whClientContext* clientContext)
 {
-#if !defined(WOLFHSM_CFG_NO_CRYPTO)
     int ret = 0;
     uint32_t client_id = 0;
     uint32_t server_id = 0;
@@ -270,17 +241,10 @@ int wh_DemoClient_SecBoot_Provision(whClientContext* clientContext)
     }
     printf("Provision Client completed with ret:%d\n", ret);
     return ret;
-#else
-    (void)clientContext;
-    (void)_signHash;
-    (void)_provisionMakeCommitKey;
-    return WH_ERROR_NOTIMPL;
-#endif /* !WOLFHSM_CFG_NO_CRYPTO */
 }
 
 int wh_DemoClient_SecBoot_Boot(whClientContext* clientContext)
 {
-#if !defined(WOLFHSM_CFG_NO_CRYPTO)
     int ret = 0;
     uint32_t client_id = 0;
     uint32_t server_id = 0;
@@ -337,12 +301,6 @@ int wh_DemoClient_SecBoot_Boot(whClientContext* clientContext)
     }
     printf("SecBoot Client completed with ret:%d\n", ret);
     return ret;
-#else
-    (void)clientContext;
-    (void)_verifyHash;
-    (void)_sha256File;
-    return WH_ERROR_NOTIMPL;
-#endif /* !WOLFHSM_CFG_NO_CRYPTO */
 }
 
 int wh_DemoClient_SecBoot_Zeroize(whClientContext* clientContext)
@@ -374,3 +332,5 @@ int wh_DemoClient_SecBoot_Zeroize(whClientContext* clientContext)
     printf("SecBoot Zeroize Client completed with ret:%d\n", ret);
     return ret;
 }
+
+#endif /* !WOLFHSM_CFG_NO_CRYPTO */

Original file line number	Diff line number	Diff line change
`@@ -831,4 +831,4 @@ int wh_Bench_Mod_Aes256GCMDecryptDma(whClientContext* client,`
`831`	`831`
`832`	`832`	`#endif /* !defined(NO_AES) */`
`833`	`833`
`834`		`-#endif /* WOLFHSM_CFG_BENCH_ENABLE */`
	`834`	`+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */`
Original file line number	Diff line number	Diff line change
`@@ -183,4 +183,4 @@ int wh_Bench_Mod_CmacAes256Dma(whClientContext* client, whBenchOpContext* ctx,`
`183`	`183`
`184`	`184`	`#endif /* WOLFSSL_CMAC && !defined(NO_AES) && defined(WOLFSSL_AES_DIRECT) */`
`185`	`185`
`186`		`-#endif /* WOLFHSM_CFG_BENCH_ENABLE */`
	`186`	`+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */`
Original file line number	Diff line number	Diff line change
`@@ -252,4 +252,4 @@ int wh_Bench_Mod_Curve25519SharedSecret(whClientContext* client,`
`252`	`252`
`253`	`253`	`#endif /* HAVE_CURVE25519 */`
`254`	`254`
`255`		`-#endif /* WOLFHSM_CFG_BENCH_ENABLE */`
	`255`	`+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */`
Original file line number	Diff line number	Diff line change
`@@ -567,4 +567,4 @@ int wh_Bench_Mod_EccP256Ecdh(whClientContext* client, whBenchOpContext* ctx,`
`567`	`567`
`568`	`568`	`#endif /* HAVE_ECC */`
`569`	`569`
`570`		`-#endif /* WOLFHSM_CFG_BENCH_ENABLE */`
	`570`	`+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */`
Original file line number	Diff line number	Diff line change
`@@ -175,4 +175,4 @@ int wh_Bench_Mod_HmacSha3256Dma(whClientContext* client, whBenchOpContext* ctx,`
`175`	`175`
`176`	`176`	`#endif /* !defined(NO_HMAC) */`
`177`	`177`
`178`		`-#endif /* WOLFHSM_CFG_BENCH_ENABLE */`
	`178`	`+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */`
Original file line number	Diff line number	Diff line change
`@@ -1193,4 +1193,4 @@ int wh_Bench_Mod_MlDsa87KeyGenDma(whClientContext* client,`
`1193`	`1193`
`1194`	`1194`	`#endif /* HAVE_DILITHIUM */`
`1195`	`1195`
`1196`		`-#endif /* WOLFHSM_CFG_BENCH_ENABLE */`
	`1196`	`+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */`
Original file line number	Diff line number	Diff line change
`@@ -94,4 +94,4 @@ int wh_Bench_Mod_Rng(whClientContext* client, whBenchOpContext* ctx, int id,`
`94`	`94`
`95`	`95`	`#endif /* !defined(WC_NO_RNG) */`
`96`	`96`
`97`		`-#endif /* WOLFHSM_CFG_BENCH_ENABLE */`
	`97`	`+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */`
Original file line number	Diff line number	Diff line change
`@@ -1115,4 +1115,4 @@ int wh_Bench_Mod_Rsa4096KeyGenDma(whClientContext* client,`
`1115`	`1115`
`1116`	`1116`	`#endif /* !(NO_RSA) */`
`1117`	`1117`
`1118`		`-#endif /* WOLFHSM_CFG_BENCH_ENABLE */`
	`1118`	`+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */`
Original file line number	Diff line number	Diff line change
`@@ -549,4 +549,4 @@ int wh_Bench_Mod_Sha512Dma(whClientContext* client, whBenchOpContext* ctx,`
`549`	`549`
`550`	`550`	`#endif /* WOLFSSL_SHA512 */`
`551`	`551`
`552`		`-#endif /* WOLFHSM_CFG_BENCH_ENABLE */`
	`552`	`+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */`
Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,4 @@ int wh_Bench_Mod_Sha3256Dma(whClientContext* client, whBenchOpContext* ctx,`
`45`	`45`
`46`	`46`	`#endif /* WOLFSSL_SHA3 */`
`47`	`47`
`48`		`-#endif /* WOLFHSM_CFG_BENCH_ENABLE */`
	`48`	`+#endif /* !WOLFHSM_CFG_NO_CRYPTO && WOLFHSM_CFG_BENCH_ENABLE */`