fix errors on make NOCRYPTO=1

miyazakh · miyazakh · commit 0157530b5dcd · 2025-10-18T10:58:32.000+09:00
diff --git a/benchmark/bench_modules/wh_bench_mod_aes.c b/benchmark/bench_modules/wh_bench_mod_aes.c
@@ -21,10 +21,9 @@
 #include "wolfhsm/wh_client.h"
 #include "wolfhsm/wh_client_crypto.h"
 
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && defined(WOLFHSM_CFG_BENCH_ENABLE)
 #include "wolfssl/wolfcrypt/aes.h"
 
-#if defined(WOLFHSM_CFG_BENCH_ENABLE)
-
 #if defined(WOLFHSM_CFG_DMA) && defined(WOLFHSM_CFG_TEST_POSIX)
 #include "port/posix/posix_transport_shm.h"
 #endif /* WOLFHSM_CFG_DMA && WOLFHSM_CFG_TEST_POSIX */
diff --git a/benchmark/bench_modules/wh_bench_mod_cmac.c b/benchmark/bench_modules/wh_bench_mod_cmac.c
@@ -21,10 +21,9 @@
 #include "wolfhsm/wh_error.h"
 #include "wolfhsm/wh_client_crypto.h"
 
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && defined(WOLFHSM_CFG_BENCH_ENABLE)
 #include "wolfssl/wolfcrypt/cmac.h"
 
-#if defined(WOLFHSM_CFG_BENCH_ENABLE)
-
 #if defined(WOLFSSL_CMAC) && !defined(NO_AES) && defined(WOLFSSL_AES_DIRECT)
 
 static const uint8_t key128[] = {0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae,
diff --git a/benchmark/bench_modules/wh_bench_mod_curve25519.c b/benchmark/bench_modules/wh_bench_mod_curve25519.c
@@ -21,12 +21,12 @@
 #include "wolfhsm/wh_client.h"
 #include "wolfhsm/wh_client_crypto.h"
 
+
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && defined(WOLFHSM_CFG_BENCH_ENABLE)
 #include "wolfssl/wolfcrypt/settings.h"
 #include "wolfssl/wolfcrypt/random.h"
 #include "wolfssl/wolfcrypt/curve25519.h"
 
-#if defined(WOLFHSM_CFG_BENCH_ENABLE)
-
 #if defined(HAVE_CURVE25519)
 
 uint8_t key1_der[] = {
diff --git a/benchmark/bench_modules/wh_bench_mod_ecc.c b/benchmark/bench_modules/wh_bench_mod_ecc.c
@@ -21,11 +21,12 @@
 #include "wolfhsm/wh_client.h"
 #include "wolfhsm/wh_client_crypto.h"
 
+
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && defined(WOLFHSM_CFG_BENCH_ENABLE)
+
 #include "wolfssl/wolfcrypt/ecc.h"
 #include "wolfssl/wolfcrypt/random.h"
 
-#if defined(WOLFHSM_CFG_BENCH_ENABLE)
-
 #if defined(HAVE_ECC)
 
 /* hardcoded DER-encoded ECC keys for benchmarking */
diff --git a/benchmark/bench_modules/wh_bench_mod_hkdf.c b/benchmark/bench_modules/wh_bench_mod_hkdf.c
@@ -20,12 +20,11 @@
 #include "wh_bench_mod.h"
 #include "wolfhsm/wh_error.h"
 
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && defined(WOLFHSM_CFG_BENCH_ENABLE)
 #include "wolfssl/wolfcrypt/hmac.h"
 #include "wolfssl/wolfcrypt/kdf.h"
 #include "wolfssl/wolfcrypt/sha256.h"
 
-#if defined(WOLFHSM_CFG_BENCH_ENABLE)
-
 #if defined(HAVE_HKDF)
 
 
@@ -93,4 +92,4 @@ int wh_Bench_Mod_HkdfSha256(whClientContext* client, whBenchOpContext* ctx,
 
 #endif /* defined(HAVE_HKDF) */
 
-#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
@@ -19,11 +19,10 @@
 #include "wh_bench_mod.h"
 #include "wolfhsm/wh_error.h"
 
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && defined(WOLFHSM_CFG_BENCH_ENABLE)
 #include "wolfssl/wolfcrypt/hmac.h"
 #include "wolfssl/wolfcrypt/sha256.h"
 
-#if defined(WOLFHSM_CFG_BENCH_ENABLE)
-
 #if !defined(NO_HMAC)
 
 #if !defined(NO_SHA256)
diff --git a/benchmark/bench_modules/wh_bench_mod_mldsa.c b/benchmark/bench_modules/wh_bench_mod_mldsa.c
@@ -21,11 +21,11 @@
 #include "wolfhsm/wh_client.h"
 #include "wolfhsm/wh_client_crypto.h"
 
+
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && defined(WOLFHSM_CFG_BENCH_ENABLE)
 #include "wolfssl/wolfcrypt/dilithium.h"
 #include "wolfssl/wolfcrypt/random.h"
 
-#if defined(WOLFHSM_CFG_BENCH_ENABLE)
-
 #if defined(HAVE_DILITHIUM)
 
 #if !defined(WOLFSSL_DILITHIUM_NO_SIGN)
diff --git a/benchmark/bench_modules/wh_bench_mod_rng.c b/benchmark/bench_modules/wh_bench_mod_rng.c
@@ -18,9 +18,10 @@
  */
 #include "wh_bench_mod.h"
 #include "wolfhsm/wh_error.h"
-#include "wolfssl/wolfcrypt/random.h"
 
-#if defined(WOLFHSM_CFG_BENCH_ENABLE)
+
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && defined(WOLFHSM_CFG_BENCH_ENABLE)
+#include "wolfssl/wolfcrypt/random.h"
 
 #if !defined(WC_NO_RNG)
 
diff --git a/benchmark/bench_modules/wh_bench_mod_rsa.c b/benchmark/bench_modules/wh_bench_mod_rsa.c
@@ -21,11 +21,10 @@
 #include "wolfhsm/wh_client.h"
 #include "wolfhsm/wh_client_crypto.h"
 
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && defined(WOLFHSM_CFG_BENCH_ENABLE)
 #include "wolfssl/wolfcrypt/rsa.h"
 #include "wolfssl/wolfcrypt/random.h"
 
-#if defined(WOLFHSM_CFG_BENCH_ENABLE)
-
 #if !defined(NO_RSA)
 
 /* RSA 2048-bit key in DER format for benchmarking */
diff --git a/benchmark/bench_modules/wh_bench_mod_sha2.c b/benchmark/bench_modules/wh_bench_mod_sha2.c
@@ -21,11 +21,10 @@
 #include "wolfhsm/wh_error.h"
 #include "wolfhsm/wh_client_crypto.h"
 
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && defined(WOLFHSM_CFG_BENCH_ENABLE)
 #include "wolfssl/wolfcrypt/hash.h"
 #include "wolfssl/wolfcrypt/sha256.h"
 
-#if defined(WOLFHSM_CFG_BENCH_ENABLE)
-
 #if defined(WOLFHSM_CFG_DMA) && defined(WOLFHSM_CFG_TEST_POSIX)
 #include "port/posix/posix_transport_shm.h"
 #endif /* WOLFHSM_CFG_DMA && WOLFHSM_CFG_POSIX_TRANSPORT */
diff --git a/benchmark/bench_modules/wh_bench_mod_sha3.c b/benchmark/bench_modules/wh_bench_mod_sha3.c
@@ -19,7 +19,7 @@
 #include "wh_bench_mod.h"
 #include "wolfhsm/wh_error.h"
 
-#if defined(WOLFHSM_CFG_BENCH_ENABLE)
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && defined(WOLFHSM_CFG_BENCH_ENABLE)
 
 #if defined(WOLFSSL_SHA3)
 
diff --git a/benchmark/wh_bench.c b/benchmark/wh_bench.c
@@ -73,7 +73,7 @@ typedef struct BenchModule {
  * of the array will be BENCH_MODULE_IDX_COUNT */
 typedef enum BenchModuleIdx {
     BENCH_MODULE_IDX_ECHO = 0,
-
+#if !defined(WOLFHSM_CFG_NO_CRYPTO)
 /* RNG */
 #if !defined(WC_NO_RNG)
     BENCH_MODULE_IDX_RNG,
@@ -233,7 +233,7 @@ typedef enum BenchModuleIdx {
     BENCH_MODULE_IDX_ML_DSA_87_KEY_GEN_DMA,
 #endif /* !(WOLFSSL_NO_ML_DSA_87) */
 #endif /* HAVE_DILITHIUM */
-
+#endif /* !(WOLFHSM_CFG_NO_CRYPTO) */
     /* number of modules. This must be the last entry and will be used as the
      * size of the global modules array */
     BENCH_MODULE_IDX_COUNT
@@ -246,7 +246,7 @@ WH_UTILS_STATIC_ASSERT(MAX_BENCH_OPS > BENCH_MODULE_IDX_COUNT,
 /* clang-format off */
 static BenchModule g_benchModules[] = {
     [BENCH_MODULE_IDX_ECHO]                    = {"ECHO",                         wh_Bench_Mod_Echo,                 BENCH_THROUGHPUT_XBPS, 0, NULL},
-
+#if !defined(WOLFHSM_CFG_NO_CRYPTO)
     /* RNG */
 #if !defined(WC_NO_RNG)
     [BENCH_MODULE_IDX_RNG]                     = {"RNG",                          wh_Bench_Mod_Rng,                  BENCH_THROUGHPUT_XBPS, 0, NULL},
@@ -402,6 +402,7 @@ static BenchModule g_benchModules[] = {
     [BENCH_MODULE_IDX_ML_DSA_87_KEY_GEN_DMA]   = {"ML-DSA-87-KEY-GEN-DMA",        wh_Bench_Mod_MlDsa87KeyGenDma,        BENCH_THROUGHPUT_OPS, 0, NULL},
 #endif /* !(WOLFSSL_NO_ML_DSA_87) */
 #endif /* HAVE_DILITHIUM */
+#endif /* !(WOLFHSM_CFG_NO_CRYPTO) */
 };
 /* clang-format on */
 
diff --git a/benchmark/wh_bench_main.c b/benchmark/wh_bench_main.c
@@ -25,6 +25,7 @@
 
 #include <wolfssl/version.h>
 #include <string.h>
+#include <stdlib.h>
 
 void Usage(const char* exeName)
 {
diff --git a/examples/demo/client/wh_demo_client_all.c b/examples/demo/client/wh_demo_client_all.c
@@ -39,7 +39,8 @@ int wh_DemoClient_All(whClientContext* clientContext)
     if (rc != 0) {
         return rc;
     }
-#ifndef NO_AES
+
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && !defined(NO_AES)
     rc = wh_DemoClient_KeystoreAes(clientContext);
     if (rc != 0) {
         return rc;
@@ -54,7 +55,7 @@ int wh_DemoClient_All(whClientContext* clientContext)
 #endif /* WOLFHSM_CFG_KEYWRAP */
 
     /**Crypto demos */
-#ifndef NO_RSA
+#if !defined(WOLFHSM_CFG_NO_CRYPTO) && !defined(NO_RSA)
     rc = wh_DemoClient_CryptoRsa(clientContext);
     if (rc != 0) {
         return rc;
diff --git a/examples/demo/client/wh_demo_client_crypto.c b/examples/demo/client/wh_demo_client_crypto.c
@@ -11,9 +11,11 @@
 #include "wolfhsm/wh_client.h"
 #include "wolfhsm/wh_client_crypto.h"
 
+#if !defined(WOLFHSM_CFG_NO_CRYPTO)
 #include "wolfssl/wolfcrypt/settings.h"
 #include "wolfssl/wolfcrypt/types.h"
 
+
 #if !defined(WC_NO_RNG)
 #include "wolfssl/wolfcrypt/random.h"
 #endif
@@ -40,8 +42,6 @@
 
 #include "wh_demo_client_crypto.h"
 
-#ifndef WOLFHSM_CFG_NO_CRYPTO
-
 #if !defined(NO_RSA)
 
 /*
diff --git a/examples/demo/client/wh_demo_client_keystore.c b/examples/demo/client/wh_demo_client_keystore.c
@@ -7,9 +7,11 @@
 #include "wolfhsm/wh_client.h"
 #include "wolfhsm/wh_client_crypto.h"
 
+#if !defined(WOLFHSM_CFG_NO_CRYPTO)
 #include "wolfssl/wolfcrypt/settings.h"
 #include "wolfssl/wolfcrypt/aes.h"
 #include "wolfssl/wolfcrypt/random.h"
+#endif /* !WOLFHSM_CFG_NO_CRYPTO */
 
 #include "wh_demo_client_keystore.h"
 
diff --git a/examples/demo/client/wh_demo_client_keywrap.c b/examples/demo/client/wh_demo_client_keywrap.c
@@ -27,9 +27,11 @@
 #include "wolfhsm/wh_client.h"
 #include "wolfhsm/wh_client_crypto.h"
 
+#if !defined(WOLFHSM_CFG_NO_CRYPTO)
 #include "wolfssl/wolfcrypt/settings.h"
 #include "wolfssl/wolfcrypt/aes.h"
 #include "wolfssl/wolfcrypt/random.h"
+#endif /* !WOLFHSM_CFG_NO_CRYPTO */
 
 #include "wh_demo_client_keywrap.h"
 
diff --git a/examples/demo/client/wh_demo_client_secboot.c b/examples/demo/client/wh_demo_client_secboot.c
@@ -13,12 +13,13 @@
 #include "wolfhsm/wh_client.h"
 #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
@@ -221,6 +222,7 @@ static int _verifyHash(const uint8_t* hash, size_t hash_len, const uint8_t* sig,
 
 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;
@@ -268,10 +270,17 @@ 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;
@@ -328,6 +337,12 @@ 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)
diff --git a/examples/demo/client/wh_demo_client_wcbench.c b/examples/demo/client/wh_demo_client_wcbench.c
@@ -1,11 +1,18 @@
 #include "wolfhsm/wh_client.h"
+#include "wolfhsm/wh_error.h"
 
+#if !defined(WOLFHSM_CFG_NO_CRYPTO)
 #include "wolfcrypt/benchmark/benchmark.h"
+#endif
 
 #include "wh_demo_client_wcbench.h"
 
 int wh_DemoClient_wcBench(whClientContext* clientContext)
 {
     (void)clientContext;
+#if !defined(WOLFHSM_CFG_NO_CRYPTO)
     return benchmark_test(NULL);
+#else
+    return WH_ERROR_NOTIMPL;
+#endif
 }
diff --git a/examples/demo/client/wh_demo_client_wctest.c b/examples/demo/client/wh_demo_client_wctest.c
@@ -1,11 +1,18 @@
 #include "wolfhsm/wh_client.h"
+#include "wolfhsm/wh_error.h"
 
+#if !defined(WOLFHSM_CFG_NO_CRYPTO)
 #include "wolfcrypt/test/test.h"
+#endif
 
 #include "wh_demo_client_wctest.h"
 
 int wh_DemoClient_wcTest(whClientContext* clientContext)
 {
     (void)clientContext;
+#if !defined(WOLFHSM_CFG_NO_CRYPTO)
     return wolfcrypt_test(NULL);
+#else
+    return WH_ERROR_NOTIMPL;
+#endif
 }
diff --git a/examples/posix/wh_posix_server/wh_posix_server.c b/examples/posix/wh_posix_server/wh_posix_server.c
@@ -58,6 +58,7 @@ const char* type = "tcp"; /* default to tcp type */
 static int loadAndStoreKeys(whServerContext* server, whKeyId* outKeyId,
                             const char* keyFilePath, int keyId, int clientId)
 {
+#if !defined(WOLFHSM_CFG_NO_CRYPTO)
     int           ret;
     int           keyFd;
     int           keySz;
@@ -117,6 +118,14 @@ static int loadAndStoreKeys(whServerContext* server, whKeyId* outKeyId,
 
     *outKeyId = meta.id;
     return ret;
+#else
+    (void)server;
+    (void)outKeyId;
+    (void)keyFilePath;
+    (void)keyId;
+    (void)clientId;
+    return WH_ERROR_NOTIMPL;
+#endif /* !WOLFHSM_CFG_NO_CRYPTO */
 }
 
 
@@ -410,7 +419,11 @@ int main(int argc, char** argv)
     (void)keyFilePath;
     (void)keyId;
     (void)clientId;
-    (void)wh_ServerTask;
+    rc = wh_ServerTask(s_conf, keyFilePath, keyId, clientId);
+    if (rc != WH_ERROR_OK) {
+        printf("Server task failed: %d\n", rc);
+        return rc;
+    }
 #endif
     return rc;
 }
diff --git a/examples/posix/wh_posix_server/wh_posix_server_cfg.c b/examples/posix/wh_posix_server/wh_posix_server_cfg.c
@@ -1,7 +1,11 @@
 /*
  * Example server app using POSIX transport
  */
-/*#if defined(WOLFHSM_CFG_NO_CRYPTO)*/
+#include <stdio.h>  /* For printf */
+#include <stdlib.h> /* For atoi */
+#include <string.h> /* For memset, memcpy, strcmp */
+#include <ctype.h>  /* For isspace */
+
 #include "wh_posix_cfg.h"
 #include "wh_posix_server_cfg.h"
 
diff --git a/port/posix/posix_transport_shm.h b/port/posix/posix_transport_shm.h
diff --git a/src/wh_client_crypto.c b/src/wh_client_crypto.c
diff --git a/src/wh_server_she.c b/src/wh_server_she.c
diff --git a/test/wh_test_cert.h b/test/wh_test_cert.h
diff --git a/test/wh_test_keywrap.c b/test/wh_test_keywrap.c
diff --git a/tools/whnvmtool/Makefile b/tools/whnvmtool/Makefile
diff --git a/wolfhsm/wh_client.h b/wolfhsm/wh_client.h
diff --git a/wolfhsm/wh_server.h b/wolfhsm/wh_server.h
