Continued updates to new benchmarks

Author: kaleb-himes

wolfcrypt/benchmark/benchmark.c

@@ -2050,12 +2050,6 @@ static const char* bench_result_words3[][5] = {
     #define BENCH_ASYM
 #endif
 
-#if defined(BENCH_ASYM)
-#if defined(HAVE_ECC) || !defined(NO_RSA) || !defined(NO_DH) || \
-    defined(HAVE_CURVE25519) || defined(HAVE_ED25519) || \
-    defined(HAVE_CURVE448) || defined(HAVE_ED448) || \
-    defined(WOLFSSL_HAVE_MLKEM) || defined(HAVE_DILITHIUM) || \
-    defined(WOLFSSL_HAVE_LMS)
 static const char* bench_result_words2[][6] = {
 #ifdef BENCH_MICROSECOND
     { "ops took", "μsec"     , "avg" , "ops/μsec", "cycles/op",
@@ -2069,8 +2063,6 @@ static const char* bench_result_words2[][6] = {
       NULL },   /* 1 Japanese */
 #endif
 };
-#endif
-#endif
 
 #ifdef WOLFSSL_CAAM
     #include <wolfssl/wolfcrypt/port/caam/wolfcaam.h>
@@ -3191,6 +3183,7 @@ static void bench_stats_sym_finish(const char* desc, int useDeviceID,
     TEST_SLEEP();
 } /* bench_stats_sym_finish */
 
+#ifndef WC_NO_RNG
 /* Report ops/sec in the same format as bench_stats_asym_finish, but without
  * requiring BENCH_ASYM to be defined.  Used for benchmarks like RNG init/free
  * that measure operation counts rather than byte throughput. */
@@ -3284,6 +3277,7 @@ static void bench_stats_ops_finish(const char* algo, int strength,
     bench_stats_prepare();
     TEST_SLEEP();
 } /* bench_stats_ops_finish */
+#endif /* !WC_NO_RNG */
 
 #ifdef BENCH_ASYM
 #if defined(HAVE_ECC) || !defined(NO_RSA) || !defined(NO_DH) || \