Merge pull request #209 from bigbrett/release-quickfixes

macro protection and compiler warning fixes

Author: AlexLanzano

benchmark/bench_modules/wh_bench_mod_sha2.c

@@ -53,6 +53,8 @@ int _benchSha256(whClientContext* client, whBenchOpContext* ctx, int id,
 #if defined(WOLFHSM_CFG_DMA)
     if (devId == WH_DEV_ID_DMA) {
         inLen = WOLFHSM_CFG_BENCH_DMA_BUFFER_SIZE;
+
+#if defined(WOLFHSM_CFG_TEST_POSIX)
         if (ctx->transportType == WH_BENCH_TRANSPORT_POSIX_DMA) {
             /* if static memory was used with DMA then use XMALLOC */
             void* heap =
@@ -68,7 +70,9 @@ int _benchSha256(whClientContext* client, whBenchOpContext* ctx, int id,
                 return WH_ERROR_NOSPACE;
             }
         }
-        else {
+        else
+#endif /* WOLFHSM_CFG_TEST_POSIX */
+        {
             in = WH_BENCH_DMA_BUFFER;
         }
     }
@@ -138,7 +142,7 @@ int _benchSha256(whClientContext* client, whBenchOpContext* ctx, int id,
         (void)wc_Sha256Free(sha256);
     }
 
-#if defined(WOLFHSM_CFG_DMA)
+#if defined(WOLFHSM_CFG_DMA) && defined(WOLFHSM_CFG_TEST_POSIX)
     if (devId == WH_DEV_ID_DMA &&
         ctx->transportType == WH_BENCH_TRANSPORT_POSIX_DMA) {
         /* if static memory was used with DMA then use XFREE */

benchmark/config/wolfhsm_cfg.h

@@ -43,4 +43,5 @@
 
 /* Benchmark configs */
 #define WOLFHSM_CFG_BENCH_ENABLE
+#define WOLFHSM_CFG_BENCH_MAIN
 #endif /* WOLFHSM_CFG_H_ */

benchmark/wh_bench_main.c

@@ -21,7 +21,7 @@
 #include "wh_bench_ops.h"
 #include "wh_bench_utils.h"
 
-#if defined(WOLFHSM_CFG_BENCH_ENABLE)
+#if defined(WOLFHSM_CFG_BENCH_ENABLE) && defined(WOLFHSM_CFG_BENCH_MAIN)
 
 #include <wolfssl/version.h>
 #include <string.h>
@@ -95,4 +95,4 @@ int main(int argc, char** argv)
     return 0;
 }
 
-#endif /* WOLFHSM_CFG_BENCH_ENABLE */
+#endif /* WOLFHSM_CFG_BENCH_ENABLE && WOLFHSM_CFG_BENCH_MAIN */