Wdeclaration-after-statement fixes

Author: Frauschi

benchmark/Makefile

@@ -40,7 +40,7 @@ ARCHFLAGS ?=
 # Enable extra C compiler warnings
 CFLAGS_EXTRA = -Werror -Wall -Wextra
 # Place functions / data into separate sections to allow unused code removal
-CFLAGS_EXTRA += -ffunction-sections -fdata-sections
+CFLAGS_EXTRA += -ffunction-sections -fdata-sections -Wdeclaration-after-statement
 
 # C standard to use (default to c90 if not specified)
 CSTD 		?= -std=c90

benchmark/bench_modules/wh_bench_mod_curve25519.c

@@ -52,16 +52,16 @@ uint8_t key2_der[] = {
 int wh_Bench_Mod_Curve25519KeyGen(whClientContext*  client,
                                   whBenchOpContext* ctx, int id, void* params)
 {
-    (void)client;
-    (void)params;
-
     int            ret    = 0;
     curve25519_key key[1] = {0};
     WC_RNG         rng[1] = {0};
     int            i;
     int            initialized_rng = 0;
     int            initialized_key = 0;
 
+    (void)client;
+    (void)params;
+
     /* Initialize the RNG for key generation */
     ret = wc_InitRng_ex(rng, NULL, WH_DEV_ID);
     if (ret != 0) {
@@ -126,8 +126,6 @@ int wh_Bench_Mod_Curve25519SharedSecret(whClientContext*  client,
                                         whBenchOpContext* ctx, int id,
                                         void* params)
 {
-    (void)params;
-
     int            ret = 0;
     word32         outLen;
     curve25519_key keyAlice[1] = {0};
@@ -140,6 +138,8 @@ int wh_Bench_Mod_Curve25519SharedSecret(whClientContext*  client,
     whKeyId        keyIdBob          = WH_KEYID_ERASED;
     char           keyLabel[]        = "bench-key";
 
+    (void)params;
+
     /* Cache Alice's key in the HSM */
     ret = wh_Client_KeyCache(client, WH_NVM_FLAGS_USAGE_ANY, (uint8_t*)keyLabel,
                              strlen(keyLabel), key1_der, sizeof(key1_der),

benchmark/bench_modules/wh_bench_mod_ecc.c

@@ -293,15 +293,15 @@ int _benchEccVerify(whClientContext* client, whBenchOpContext* ctx, int id,
 int _benchEccKeyGen(whClientContext* client, whBenchOpContext* ctx, int id,
                     int curveSize, int devId)
 {
-    (void)client;
-
     int     ret    = 0;
     ecc_key key[1] = {0};
     WC_RNG  rng[1] = {0};
     int     i;
     int     initialized_rng = 0;
     int     initialized_key = 0;
 
+    (void)client;
+
     /* Initialize the RNG for key generation */
     ret = wc_InitRng_ex(rng, NULL, devId);
     if (ret != 0) {

benchmark/bench_modules/wh_bench_mod_echo.c

@@ -25,8 +25,6 @@
 int wh_Bench_Mod_Echo(whClientContext* client, whBenchOpContext* benchCtx,
                       int id, void* params)
 {
-    (void)params;
-
     int      i;
     int      ret;
     uint16_t send_len;
@@ -36,6 +34,8 @@ int wh_Bench_Mod_Echo(whClientContext* client, whBenchOpContext* benchCtx,
     int      startRet;
     int      stopRet;
 
+    (void)params;
+
     /* Send an entire comm buffer's worth of data */
     memset(send_buffer, 0xAA, sizeof(send_buffer));
     memset(recv_buffer, 0x55, sizeof(recv_buffer));

benchmark/bench_modules/wh_bench_mod_hmac.c

@@ -34,8 +34,6 @@ static const size_t keyLen = sizeof(key) - 1; /* -1 for null terminator */
 int _benchHmacSha256(whClientContext* client, whBenchOpContext* ctx, int id,
                      int devId)
 {
-    (void)client;
-
     int            ret = 0;
     Hmac           hmac[1];
     uint8_t        out[WC_SHA256_DIGEST_SIZE];
@@ -44,6 +42,8 @@ int _benchHmacSha256(whClientContext* client, whBenchOpContext* ctx, int id,
     const uint8_t* in;
     size_t         inLen;
 
+    (void)client;
+
 #if defined(WOLFHSM_CFG_DMA)
     if (devId == WH_DEV_ID_DMA) {
         in    = WH_BENCH_DMA_BUFFER;

benchmark/bench_modules/wh_bench_mod_mldsa.c

@@ -898,15 +898,15 @@ static int _benchMlDsaVerify(whClientContext* client, whBenchOpContext* ctx,
 static int _benchMlDsaKeyGen(whClientContext* client, whBenchOpContext* ctx,
                              int id, int securityLevel, int devId)
 {
-    (void)client;
-
     int      ret = 0;
     MlDsaKey key;
     WC_RNG   rng[1] = {0};
     int      i;
     int      initialized_rng = 0;
     int      initialized_key = 0;
 
+    (void)client;
+
     /* Initialize the RNG */
     ret = wc_InitRng_ex(rng, NULL, devId);
     if (ret != 0) {

benchmark/bench_modules/wh_bench_mod_rng.c

@@ -27,15 +27,15 @@
 
 int _benchRng(whClientContext* client, whBenchOpContext* ctx, int id, int devId)
 {
-    (void)client;
-
     int      ret = 0;
     WC_RNG   rng;
     int      i              = 0;
     int      rngInitialized = 0;
     uint8_t* out            = WH_BENCH_DATA_OUT_BUFFER;
     word32   outLen         = WOLFHSM_CFG_BENCH_DATA_BUFFER_SIZE;
 
+    (void)client;
+
     ret = wc_InitRng_ex(&rng, NULL, devId);
     if (ret != 0) {
         WH_BENCH_PRINTF("Failed to wc_InitRng_ex %d\n", ret);

benchmark/bench_modules/wh_bench_mod_rsa.c

@@ -696,8 +696,6 @@ int _benchRsaSign(whClientContext* client, whBenchOpContext* ctx, int id,
 int _benchRsaKeyGen(whClientContext* client, whBenchOpContext* ctx, int id,
                     int keySize, int devId)
 {
-    (void)client;
-
     int    ret = 0;
     RsaKey rsa[1];
     WC_RNG rng[1];
@@ -706,6 +704,8 @@ int _benchRsaKeyGen(whClientContext* client, whBenchOpContext* ctx, int id,
     int    initialized_rsa = 0;
     long   exponent = WC_RSA_EXPONENT; /* Standard RSA exponent (65537) */
 
+    (void)client;
+
     /* Initialize RNG for RSA operations */
     ret = wc_InitRng_ex(rng, NULL, devId);
     if (ret != 0) {

benchmark/bench_modules/wh_bench_mod_sha2.c

@@ -34,8 +34,6 @@
 int _benchSha256(whClientContext* client, whBenchOpContext* ctx, int id,
                  int devId)
 {
-    (void)client;
-
     int            ret = 0;
     wc_Sha256*     sha256 = NULL;
     wc_Sha256      sha256Stack;
@@ -46,6 +44,8 @@ int _benchSha256(whClientContext* client, whBenchOpContext* ctx, int id,
     const uint8_t* in;
     size_t         inLen;
 
+    (void)client;
+
     sha256 = &sha256Stack;
     out    = outStack;
 
@@ -192,8 +192,6 @@ int wh_Bench_Mod_Sha256Dma(whClientContext* client, whBenchOpContext* ctx,
 int _benchSha224(whClientContext* client, whBenchOpContext* ctx, int id,
                  int devId)
 {
-    (void)client;
-
     int            ret = 0;
     wc_Sha224      sha224[1];
     uint8_t        out[WC_SHA224_DIGEST_SIZE];
@@ -202,6 +200,8 @@ int _benchSha224(whClientContext* client, whBenchOpContext* ctx, int id,
     const uint8_t* in;
     size_t         inLen;
 
+    (void)client;
+
 #if defined(WOLFHSM_CFG_DMA)
     if (devId == WH_DEV_ID_DMA) {
         in    = WH_BENCH_DMA_BUFFER;
@@ -313,8 +313,6 @@ int wh_Bench_Mod_Sha224Dma(whClientContext* client, whBenchOpContext* ctx,
 int _benchSha384(whClientContext* client, whBenchOpContext* ctx, int id,
                  int devId)
 {
-    (void)client;
-
     int            ret = 0;
     wc_Sha384      sha384[1];
     uint8_t        out[WC_SHA384_DIGEST_SIZE];
@@ -323,6 +321,8 @@ int _benchSha384(whClientContext* client, whBenchOpContext* ctx, int id,
     const uint8_t* in;
     size_t         inLen;
 
+    (void)client;
+
 #if defined(WOLFHSM_CFG_DMA)
     if (devId == WH_DEV_ID_DMA) {
         in    = WH_BENCH_DMA_BUFFER;
@@ -433,8 +433,6 @@ int wh_Bench_Mod_Sha384Dma(whClientContext* client, whBenchOpContext* ctx,
 int _benchSha512(whClientContext* client, whBenchOpContext* ctx, int id,
                  int devId)
 {
-    (void)client;
-
     int            ret = 0;
     wc_Sha512      sha512[1];
     uint8_t        out[WC_SHA512_DIGEST_SIZE];
@@ -443,6 +441,8 @@ int _benchSha512(whClientContext* client, whBenchOpContext* ctx, int id,
     const uint8_t* in;
     size_t         inLen;
 
+    (void)client;
+
 #if defined(WOLFHSM_CFG_DMA)
     if (devId == WH_DEV_ID_DMA) {
         in    = WH_BENCH_DMA_BUFFER;

benchmark/wh_bench.c

@@ -1029,19 +1029,6 @@ int wh_Bench_ClientServer_Posix(int transport, int moduleIndex)
     /* Server configuration/contexts */
     whServerConfig s_conf[1] = {{0}};
 
-    /* Configure transport based on type */
-    ret = _configureClientTransport(transport, c_conf);
-    if (ret != WH_ERROR_OK) {
-        WH_BENCH_PRINTF("Failed to configure client transport: %d\n", ret);
-        return ret;
-    }
-
-    ret = _configureServerTransport(transport, s_conf);
-    if (ret != WH_ERROR_OK) {
-        WH_BENCH_PRINTF("Failed to configure server transport: %d\n", ret);
-        return ret;
-    }
-
     /* RamSim Flash state and configuration */
     whFlashRamsimCtx fc[1]      = {0};
     whFlashRamsimCfg fc_conf[1] = {{
@@ -1074,6 +1061,19 @@ int wh_Bench_ClientServer_Posix(int transport, int moduleIndex)
     whServerCryptoContext crypto[1] = {0};
 #endif
 
+    /* Configure transport based on type */
+    ret = _configureClientTransport(transport, c_conf);
+    if (ret != WH_ERROR_OK) {
+        WH_BENCH_PRINTF("Failed to configure client transport: %d\n", ret);
+        return ret;
+    }
+
+    ret = _configureServerTransport(transport, s_conf);
+    if (ret != WH_ERROR_OK) {
+        WH_BENCH_PRINTF("Failed to configure server transport: %d\n", ret);
+        return ret;
+    }
+
     /* Set up server configuration with NVM and crypto */
     s_conf[0].nvm = nvm;
 #ifndef WOLFHSM_CFG_NO_CRYPTO