protect benchmark code with feature macro

bigbrett · bigbrett · commit 1aa37826c851 · 2025-05-12T14:06:33.000-06:00
diff --git a/benchmark/bench_modules/wh_bench_mod_aes.c b/benchmark/bench_modules/wh_bench_mod_aes.c
@@ -23,6 +23,8 @@
 
 #include "wolfssl/wolfcrypt/aes.h"
 
+#if defined(WOLFHSM_CFG_BENCH_ENABLE)
+
 #if !defined(NO_AES)
 
 /* 128-bit key */
@@ -353,3 +355,5 @@ int wh_Bench_Mod_Aes256GCMDecrypt(whClientContext* client, BenchOpContext* ctx,
 #endif /* HAVE_AESGCM */
 
 #endif /* !defined(NO_AES) */
+
+#endif /* WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_cmac.c b/benchmark/bench_modules/wh_bench_mod_cmac.c
@@ -23,6 +23,8 @@
 
 #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,
@@ -159,4 +161,6 @@ int wh_Bench_Mod_CmacAes256Dma(whClientContext* client, BenchOpContext* ctx,
 #endif
 }
 
-#endif /* WOLFSSL_CMAC && !defined(NO_AES) && defined(WOLFSSL_AES_DIRECT) */
+#endif /* WOLFSSL_CMAC && !defined(NO_AES) && defined(WOLFSSL_AES_DIRECT) */
+
+#endif /* WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_curve25519.c b/benchmark/bench_modules/wh_bench_mod_curve25519.c
@@ -25,6 +25,8 @@
 #include "wolfssl/wolfcrypt/random.h"
 #include "wolfssl/wolfcrypt/curve25519.h"
 
+#if defined(WOLFHSM_CFG_BENCH_ENABLE)
+
 #if defined(HAVE_CURVE25519)
 
 uint8_t key1_der[] = {
@@ -243,4 +245,6 @@ int wh_Bench_Mod_Curve25519SharedSecret(whClientContext* client,
     return ret;
 }
 
-#endif /* HAVE_CURVE25519 */
+#endif /* HAVE_CURVE25519 */
+
+#endif /* WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_ecc.c b/benchmark/bench_modules/wh_bench_mod_ecc.c
@@ -24,6 +24,8 @@
 #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 */
@@ -548,4 +550,6 @@ int wh_Bench_Mod_EccP256Ecdh(whClientContext* client, BenchOpContext* ctx,
                          bobKeyDer, sizeof(bobKeyDer), 32, WH_DEV_ID);
 }
 
-#endif /* HAVE_ECC */
+#endif /* HAVE_ECC */
+
+#endif /* WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_echo.c b/benchmark/bench_modules/wh_bench_mod_echo.c
@@ -20,6 +20,8 @@
 #include <string.h>
 #include "wh_bench_mod.h"
 
+#if defined(WOLFHSM_CFG_BENCH_ENABLE)
+
 int wh_Bench_Mod_Echo(whClientContext* client, BenchOpContext* benchCtx, int id,
                       void* params)
 {
@@ -86,3 +88,5 @@ int wh_Bench_Mod_Echo(whClientContext* client, BenchOpContext* benchCtx, int id,
 
     return ret;
 }
+
+#endif /* WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_hmac.c b/benchmark/bench_modules/wh_bench_mod_hmac.c
@@ -22,6 +22,8 @@
 #include "wolfssl/wolfcrypt/hmac.h"
 #include "wolfssl/wolfcrypt/sha256.h"
 
+#if defined(WOLFHSM_CFG_BENCH_ENABLE)
+
 #if !defined(NO_HMAC)
 
 #if !defined(NO_SHA256)
@@ -157,3 +159,5 @@ int wh_Bench_Mod_HmacSha3256Dma(whClientContext* client, BenchOpContext* ctx,
 #endif /* WOLFSSL_SHA3 */
 
 #endif /* !defined(NO_HMAC) */
+
+#endif /* WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_mldsa.c b/benchmark/bench_modules/wh_bench_mod_mldsa.c
@@ -24,6 +24,8 @@
 #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)
@@ -1110,3 +1112,5 @@ int wh_Bench_Mod_MlDsa87KeyGenDma(whClientContext* client, BenchOpContext* ctx,
 #endif /* !defined(WOLFSSL_NO_ML_DSA_87) */
 
 #endif /* HAVE_DILITHIUM */
+
+#endif /* WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_rng.c b/benchmark/bench_modules/wh_bench_mod_rng.c
@@ -20,6 +20,8 @@
 #include "wolfhsm/wh_error.h"
 #include "wolfssl/wolfcrypt/random.h"
 
+#if defined(WOLFHSM_CFG_BENCH_ENABLE)
+
 #if !defined(WC_NO_RNG)
 
 int _benchRng(whClientContext* client, BenchOpContext* ctx, int id, int devId)
@@ -86,3 +88,5 @@ int wh_Bench_Mod_Rng(whClientContext* client, BenchOpContext* ctx, int id,
 }
 
 #endif /* !defined(WC_NO_RNG) */
+
+#endif /* WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_rsa.c b/benchmark/bench_modules/wh_bench_mod_rsa.c
@@ -24,6 +24,8 @@
 #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 */
@@ -975,3 +977,5 @@ int wh_Bench_Mod_Rsa4096KeyGenDma(whClientContext* client, BenchOpContext* ctx,
 }
 
 #endif /* !(NO_RSA) */
+
+#endif /* WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_sha2.c b/benchmark/bench_modules/wh_bench_mod_sha2.c
@@ -23,6 +23,8 @@
 #include "wolfssl/wolfcrypt/hash.h"
 #include "wolfssl/wolfcrypt/sha256.h"
 
+#if defined(WOLFHSM_CFG_BENCH_ENABLE)
+
 #if !defined(NO_SHA256)
 
 int _benchSha256(whClientContext* client, BenchOpContext* ctx, int id,
@@ -131,3 +133,5 @@ int wh_Bench_Mod_Sha256Dma(whClientContext* client, BenchOpContext* ctx, int id,
 }
 
 #endif /* !defined(NO_SHA256) */
+
+#endif /* WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/bench_modules/wh_bench_mod_sha3.c b/benchmark/bench_modules/wh_bench_mod_sha3.c
@@ -19,6 +19,8 @@
 #include "wh_bench_mod.h"
 #include "wolfhsm/wh_error.h"
 
+#if defined(WOLFHSM_CFG_BENCH_ENABLE)
+
 #if defined(WOLFSSL_SHA3)
 
 int wh_Bench_Mod_Sha3256(whClientContext* client, BenchOpContext* ctx, int id,
@@ -33,4 +35,6 @@ int wh_Bench_Mod_Sha3256Dma(whClientContext* client, BenchOpContext* ctx,
     return WH_ERROR_NOT_IMPL;
 }
 
-#endif /* WOLFSSL_SHA3 */
+#endif /* WOLFSSL_SHA3 */
+
+#endif /* WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/settings/wolfhsm_cfg.h b/benchmark/settings/wolfhsm_cfg.h
@@ -40,5 +40,5 @@
 #define WOLFHSM_CFG_CERTIFICATE_MANAGER_ACERT
 
 /* Benchmark configs */
-#define WOLFHSM_CFG_BENCH_KG_ITERS 1
+#define WOLFHSM_CFG_BENCH_ENABLE
 #endif /* WOLFHSM_CFG_H_ */
diff --git a/benchmark/wh_bench.c b/benchmark/wh_bench.c
@@ -44,6 +44,8 @@
 #include "wh_bench_ops.h"
 #include "wh_bench_utils.h"
 
+#if defined(WOLFHSM_CFG_BENCH_ENABLE)
+
 /* Buffer sizes for transport */
 /* Large enough to handle an RSA 4096 key */
 #define BUFFER_SIZE \
@@ -678,3 +680,5 @@ int wh_Bench_ClientServer_Posix(void)
 
 
 #endif /* WOLFHSM_CFG_TEST_POSIX */
+
+#endif /* WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/wh_bench_data.c b/benchmark/wh_bench_data.c
@@ -19,6 +19,8 @@
 
 #include "wh_bench_data.h"
 
+#if defined(WOLFHSM_CFG_BENCH_ENABLE)
+
 #if !defined(WOLFHSM_CFG_BENCH_CUSTOM_DATA_BUFFERS)
 uint8_t wh_bench_data_in_buffer[WOLFHSM_CFG_BENCH_DATA_BUFFER_SIZE]  = {0};
 uint8_t wh_bench_data_out_buffer[WOLFHSM_CFG_BENCH_DATA_BUFFER_SIZE] = {0};
@@ -28,3 +30,5 @@ uint8_t wh_bench_data_out_buffer[WOLFHSM_CFG_BENCH_DATA_BUFFER_SIZE] = {0};
 /* Define the DMA buffer if using built-in buffer */
 uint8_t wh_bench_data_dma_buffer[WOLFHSM_CFG_BENCH_DMA_BUFFER_SIZE] = {0};
 #endif
+
+#endif /* WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/wh_bench_main.c b/benchmark/wh_bench_main.c
@@ -20,6 +20,8 @@
 #include "wh_bench.h"
 #include "wh_bench_utils.h"
 
+#if defined(WOLFHSM_CFG_BENCH_ENABLE)
+
 int main(void)
 {
     WH_BENCH_PRINTF("Running wolfHSM benchmarks\n");
@@ -39,4 +41,6 @@ int main(void)
 #endif
 
     return 0;
-}
+}
+
+#endif /* WOLFHSM_CFG_BENCH_ENABLE */
diff --git a/benchmark/wh_bench_ops.c b/benchmark/wh_bench_ops.c
@@ -28,6 +28,8 @@
 #include "wh_bench_ops.h"
 #include "wh_bench_utils.h"
 
+#if defined(WOLFHSM_CFG_BENCH_ENABLE)
+
 static uint64_t _benchGetTimeUs(void);
 #if !defined(WOLFHSM_CFG_BENCH_CUSTOM_TIME_FUNC)
 static uint64_t _benchGetTimeUsDefault(void);
@@ -413,4 +415,6 @@ int wh_Bench_Cleanup(BenchOpContext* ctx)
     memset(ctx, 0, sizeof(BenchOpContext));
 
     return WH_ERROR_OK;
-}
+}
+
+#endif /* WOLFHSM_CFG_BENCH_ENABLE */

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`	`#include <string.h>`
`21`	`21`	`#include "wh_bench_mod.h"`
`22`	`22`
	`23`	`+#if defined(WOLFHSM_CFG_BENCH_ENABLE)`
	`24`	`+`
`23`	`25`	`int wh_Bench_Mod_Echo(whClientContext* client, BenchOpContext* benchCtx, int id,`
`24`	`26`	`void* params)`
`25`	`27`	`{`
`@@ -86,3 +88,5 @@ int wh_Bench_Mod_Echo(whClientContext* client, BenchOpContext* benchCtx, int id,`
`86`	`88`
`87`	`89`	`return ret;`
`88`	`90`	`}`
	`91`	`+`
	`92`	`+#endif /* WOLFHSM_CFG_BENCH_ENABLE */`