Added game selection.

Started process wrapper.
Removed asmjit.

6 files changed, 0 insertions, 6812 deletions

diff --git a/client/wolfssl/wolfcrypt/benchmark/README.md b/client/wolfssl/wolfcrypt/benchmark/README.md
deleted file mode 100644
index fc01f37..0000000
--- a/client/wolfssl/wolfcrypt/benchmark/README.md
+++ /dev/null
@@ -1,103 +0,0 @@
-# wolfCrypt Benchmarks
-
-Tool for performing cryptographic algorithm benchmarking.
-
-## Measurements
-
-* Symmetric algorithms like AES and ChaCha20 are measured in Killobytes (KB) or Megabytes (MB) per second.
-* Asymmetric algorithms like RSA and ECC are measured using Operations Per Second (Ops) per second.
-
-## Usage
-
-```sh
-./wolfcrypt/benchmark/benchmark -?
-benchmark
--? <num>    Help, print this usage
-            0: English, 1: Japanese
--csv        Print terminal output in csv format
--base10     Display bytes as power of 10 (eg 1 kB = 1000 Bytes)
--no_aad     No additional authentication data passed.
--dgst_full  Full digest operation performed.
--rsa_sign   Measure RSA sign/verify instead of encrypt/decrypt.
-<keySz> -rsa-sz
-            Measure RSA <key size> performance.
--<alg>      Algorithm to benchmark. Available algorithms include:
-              cipher aes-cbc aes-gcm aes-ecb aes-xts aes-cfb aes-ctr aes-ccm
-              camellia arc4 hc128 rabbit chacha20 chacha20-poly1305 des idea
-              digest md5 poly1305 sha sha2 sha224 sha256 sha384 sha512 sha3
-              sha3-224 sha3-256 sha3-384 sha3-512 ripemd
-              mac cmac hmac hmac-md5 hmac-sha hmac-sha224 hmac-sha256
-              hmac-sha384 hmac-sha512 pbkdf2
-              asym rsa-kg rsa rsa-sz dh ecc-kg ecc ecc-enc curve25519_kg x25519
-              ed25519-kg ed25519
-              other rng scrypt
--lng <num>  Display benchmark result by specified language.
-            0: English, 1: Japanese
-<num>       Size of block in bytes
-```
-
-The `-base10` option shows as thousands of bytes (kB).
-
-## Example Output
-
-Run on Intel(R) Core(TM) i7-7920HQ CPU @ 3.10GHz.
-
-```sh
-./configure --enable-intelasm --enable-aesni --enable-sp --enable-sp-asm && make
-
-./wolfcrypt/benchmark/benchmark
-------------------------------------------------------------------------------
- wolfSSL version 4.0.0
-------------------------------------------------------------------------------
-wolfCrypt Benchmark (block bytes 1048576, min 1.0 sec each)
-RNG                180 MB took 1.022 seconds,  176.201 MB/s Cycles per byte =  16.76
-AES-128-CBC-enc   1250 MB took 1.002 seconds, 1247.878 MB/s Cycles per byte =   2.37
-AES-128-CBC-dec   4595 MB took 1.001 seconds, 4591.703 MB/s Cycles per byte =   0.64
-AES-192-CBC-enc   1005 MB took 1.003 seconds, 1002.018 MB/s Cycles per byte =   2.95
-AES-192-CBC-dec   4345 MB took 1.000 seconds, 4344.744 MB/s Cycles per byte =   0.68
-AES-256-CBC-enc    905 MB took 1.005 seconds,  900.386 MB/s Cycles per byte =   3.28
-AES-256-CBC-dec   3255 MB took 1.001 seconds, 3251.618 MB/s Cycles per byte =   0.91
-AES-128-GCM-enc   4730 MB took 1.001 seconds, 4726.267 MB/s Cycles per byte =   0.62
-AES-128-GCM-dec   5140 MB took 1.000 seconds, 5137.596 MB/s Cycles per byte =   0.57
-AES-192-GCM-enc   4475 MB took 1.001 seconds, 4471.056 MB/s Cycles per byte =   0.66
-AES-192-GCM-dec   3405 MB took 1.001 seconds, 3403.179 MB/s Cycles per byte =   0.87
-AES-256-GCM-enc   2640 MB took 1.000 seconds, 2638.905 MB/s Cycles per byte =   1.12
-AES-256-GCM-dec   2780 MB took 1.001 seconds, 2776.632 MB/s Cycles per byte =   1.06
-CHACHA            2615 MB took 1.000 seconds, 2614.357 MB/s Cycles per byte =   1.13
-CHA-POLY          1490 MB took 1.001 seconds, 1488.344 MB/s Cycles per byte =   1.98
-MD5                440 MB took 1.010 seconds,  435.763 MB/s Cycles per byte =   6.78
-POLY1305          4900 MB took 1.001 seconds, 4896.430 MB/s Cycles per byte =   0.60
-SHA                515 MB took 1.011 seconds,  509.459 MB/s Cycles per byte =   5.80
-SHA-224            425 MB took 1.005 seconds,  422.737 MB/s Cycles per byte =   6.98
-SHA-256            420 MB took 1.006 seconds,  417.312 MB/s Cycles per byte =   7.08
-SHA-384            615 MB took 1.003 seconds,  613.018 MB/s Cycles per byte =   4.82
-SHA-512            560 MB took 1.007 seconds,  556.230 MB/s Cycles per byte =   5.31
-SHA3-224           295 MB took 1.003 seconds,  294.133 MB/s Cycles per byte =  10.04
-SHA3-256           280 MB took 1.003 seconds,  279.088 MB/s Cycles per byte =  10.58
-SHA3-384           215 MB took 1.002 seconds,  214.654 MB/s Cycles per byte =  13.76
-SHA3-512           145 MB took 1.005 seconds,  144.266 MB/s Cycles per byte =  20.47
-HMAC-MD5           485 MB took 1.004 seconds,  483.019 MB/s Cycles per byte =   6.11
-HMAC-SHA           505 MB took 1.006 seconds,  502.159 MB/s Cycles per byte =   5.88
-HMAC-SHA224        415 MB took 1.007 seconds,  411.965 MB/s Cycles per byte =   7.17
-HMAC-SHA256        380 MB took 1.002 seconds,  379.398 MB/s Cycles per byte =   7.78
-HMAC-SHA384        610 MB took 1.006 seconds,  606.370 MB/s Cycles per byte =   4.87
-HMAC-SHA512        620 MB took 1.001 seconds,  619.377 MB/s Cycles per byte =   4.77
-RSA     2048 public      52000 ops took 1.001 sec, avg 0.019 ms, 51932.223 ops/sec
-RSA     2048 private      1700 ops took 1.022 sec, avg 0.601 ms, 1662.697 ops/sec
-DH      2048 key gen      3491 ops took 1.000 sec, avg 0.286 ms, 3490.745 ops/sec
-DH      2048 agree        3500 ops took 1.014 sec, avg 0.290 ms, 3452.191 ops/sec
-ECC      256 key gen     88961 ops took 1.000 sec, avg 0.011 ms, 88960.279 ops/sec
-ECDHE    256 agree       20700 ops took 1.005 sec, avg 0.049 ms, 20605.239 ops/sec
-ECDSA    256 sign        53200 ops took 1.001 sec, avg 0.019 ms, 53157.214 ops/sec
-ECDSA    256 verify      17200 ops took 1.004 sec, avg 0.058 ms, 17124.208 ops/sec
-Benchmark complete
-```
-
-
-## Windows Visual Studio
-
-For building wolfCrypt Benchmark project in Visual Studio open the `benchmark.sln`. For newer Visual Studio version it may prompt for a one-way upgrade. Then you may have to right-click on the solution and choose `Retarget solution` to update the project files for your Visual Studio version.
-
-If you see an error about `rc.exe` then you'll need to update the "Target Platform Version". You can do this by right-clicking on the benchmark project -> General -> "Target Platform Version" and changing to 8.1 (needs to match the wolfssl library project).
-
-This solution includes the wolfSSL library project at `<wolfssl-root>wolfssl.vcxproj` and will compile the library, then the benchmark project.
diff --git a/client/wolfssl/wolfcrypt/benchmark/benchmark.c b/client/wolfssl/wolfcrypt/benchmark/benchmark.c
deleted file mode 100644
index f79f7c8..0000000
--- a/client/wolfssl/wolfcrypt/benchmark/benchmark.c
+++ /dev/null
@@ -1,6328 +0,0 @@
-/* benchmark.c
- *
- * Copyright (C) 2006-2020 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-
-/* wolfCrypt benchmark */
-
-
-#ifdef HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
-#ifndef WOLFSSL_USER_SETTINGS
-    #include <wolfssl/options.h>
-#endif
-#include <wolfssl/wolfcrypt/settings.h>
-#include <wolfssl/version.h>
-#include <wolfssl/wolfcrypt/wc_port.h>
-
-/* Macro to disable benchmark */
-#ifndef NO_CRYPT_BENCHMARK
-
-/* only for stack size check */
-#ifdef HAVE_STACK_SIZE
-    #include <wolfssl/ssl.h>
-    #include <wolfssl/test.h>
-#endif
-
-#ifdef USE_FLAT_BENCHMARK_H
-    #include "benchmark.h"
-#else
-    #include "wolfcrypt/benchmark/benchmark.h"
-#endif
-
-/* printf mappings */
-#ifdef FREESCALE_MQX
-    #include <mqx.h>
-    /* see wc_port.h for fio.h and nio.h includes */
-#elif defined(FREESCALE_KSDK_1_3)
-    #include "fsl_debug_console.h"
-    #include "fsl_os_abstraction.h"
-
-    #undef printf
-    #define printf PRINTF
-#elif defined(WOLFSSL_DEOS)
-    #include <deos.h>
-    #undef printf
-    #define printf printx
-#elif defined(MICRIUM)
-      #include <bsp_ser.h>
-      void BSP_Ser_Printf (CPU_CHAR* format, ...);
-      #undef printf
-      #define printf BSP_Ser_Printf
-#elif defined(WOLFSSL_ZEPHYR)
-    #include <stdio.h>
-    #define BENCH_EMBEDDED
-    #define printf printfk
-    static int printfk(const char *fmt, ...)
-    {
-        int ret;
-        char line[150];
-        va_list ap;
-
-        va_start(ap, fmt);
-
-        ret = vsnprintf(line, sizeof(line), fmt, ap);
-        line[sizeof(line)-1] = '\0';
-        printk("%s", line);
-
-        va_end(ap);
-
-        return ret;
-    }
-
-#elif defined(WOLFSSL_TELIT_M2MB)
-    #include <stdarg.h>
-    #include <stdio.h>
-    #include <string.h>
-    #include "m2m_log.h" /* for M2M_LOG_INFO - not standard API */
-    /* remap printf */
-    #undef printf
-    #define printf M2M_LOG_INFO
-    /* OS requires occasional sleep() */
-    #ifndef TEST_SLEEP_MS
-        #define TEST_SLEEP_MS 50
-    #endif
-    #define TEST_SLEEP() m2mb_os_taskSleep(M2MB_OS_MS2TICKS(TEST_SLEEP_MS))
-    /* don't use file system for these tests, since ./certs dir isn't loaded */
-    #undef  NO_FILESYSTEM
-    #define NO_FILESYSTEM
-
-#else
-    #if defined(XMALLOC_USER) || defined(FREESCALE_MQX)
-        /* MQX classic needs for EXIT_FAILURE */
-        #include <stdlib.h>  /* we're using malloc / free direct here */
-    #endif
-
-    #ifndef STRING_USER
-        #include <string.h>
-        #include <stdio.h>
-    #endif
-
-    /* enable way for customer to override test/bench printf */
-    #ifdef XPRINTF
-        #undef  printf
-        #define printf XPRINTF
-    #endif
-#endif
-
-#include <wolfssl/wolfcrypt/memory.h>
-#include <wolfssl/wolfcrypt/random.h>
-#include <wolfssl/wolfcrypt/des3.h>
-#include <wolfssl/wolfcrypt/arc4.h>
-#include <wolfssl/wolfcrypt/hc128.h>
-#include <wolfssl/wolfcrypt/rabbit.h>
-#include <wolfssl/wolfcrypt/chacha.h>
-#include <wolfssl/wolfcrypt/chacha20_poly1305.h>
-#include <wolfssl/wolfcrypt/aes.h>
-#include <wolfssl/wolfcrypt/poly1305.h>
-#include <wolfssl/wolfcrypt/camellia.h>
-#include <wolfssl/wolfcrypt/md5.h>
-#include <wolfssl/wolfcrypt/sha.h>
-#include <wolfssl/wolfcrypt/sha256.h>
-#include <wolfssl/wolfcrypt/sha512.h>
-#include <wolfssl/wolfcrypt/sha3.h>
-#include <wolfssl/wolfcrypt/rsa.h>
-#include <wolfssl/wolfcrypt/asn.h>
-#include <wolfssl/wolfcrypt/ripemd.h>
-#include <wolfssl/wolfcrypt/cmac.h>
-#ifndef NO_HMAC
-    #include <wolfssl/wolfcrypt/hmac.h>
-#endif
-#ifndef NO_PWDBASED
-    #include <wolfssl/wolfcrypt/pwdbased.h>
-#endif
-#ifdef HAVE_ECC
-    #include <wolfssl/wolfcrypt/ecc.h>
-#endif
-#ifdef HAVE_IDEA
-    #include <wolfssl/wolfcrypt/idea.h>
-#endif
-#ifdef HAVE_CURVE25519
-    #include <wolfssl/wolfcrypt/curve25519.h>
-#endif
-#ifdef HAVE_ED25519
-    #include <wolfssl/wolfcrypt/ed25519.h>
-#endif
-#ifdef HAVE_CURVE448
-    #include <wolfssl/wolfcrypt/curve448.h>
-#endif
-#ifdef HAVE_ED448
-    #include <wolfssl/wolfcrypt/ed448.h>
-#endif
-
-#include <wolfssl/wolfcrypt/dh.h>
-#ifdef HAVE_NTRU
-    #include "libntruencrypt/ntru_crypto.h"
-#endif
-#include <wolfssl/wolfcrypt/random.h>
-#include <wolfssl/wolfcrypt/error-crypt.h>
-#include <wolfssl/wolfcrypt/types.h>
-
-#ifdef WOLF_CRYPTO_CB
-    #include <wolfssl/wolfcrypt/cryptocb.h>
-    #ifdef HAVE_INTEL_QA_SYNC
-        #include <wolfssl/wolfcrypt/port/intel/quickassist_sync.h>
-    #endif
-    #ifdef HAVE_CAVIUM_OCTEON_SYNC
-        #include <wolfssl/wolfcrypt/port/cavium/cavium_octeon_sync.h>
-    #endif
-#endif
-
-#ifdef WOLFSSL_ASYNC_CRYPT
-    #include <wolfssl/wolfcrypt/async.h>
-#endif
-
-
-#ifdef WOLFSSL_STATIC_MEMORY
-    static WOLFSSL_HEAP_HINT* HEAP_HINT;
-#else
-    #define HEAP_HINT NULL
-#endif /* WOLFSSL_STATIC_MEMORY */
-
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
-
-/* optional macro to add sleep between tests */
-#ifndef TEST_SLEEP
-    /* stub the sleep macro */
-    #define TEST_SLEEP()
-#endif
-
-
-/* Bit values for each algorithm that is able to be benchmarked.
- * Common grouping of algorithms also.
- * Each algorithm has a unique value for its type e.g. cipher.
- */
-/* Cipher algorithms. */
-#define BENCH_AES_CBC            0x00000001
-#define BENCH_AES_GCM            0x00000002
-#define BENCH_AES_ECB            0x00000004
-#define BENCH_AES_XTS            0x00000008
-#define BENCH_AES_CTR            0x00000010
-#define BENCH_AES_CCM            0x00000020
-#define BENCH_CAMELLIA           0x00000100
-#define BENCH_ARC4               0x00000200
-#define BENCH_HC128              0x00000400
-#define BENCH_RABBIT             0x00000800
-#define BENCH_CHACHA20           0x00001000
-#define BENCH_CHACHA20_POLY1305  0x00002000
-#define BENCH_DES                0x00004000
-#define BENCH_IDEA               0x00008000
-#define BENCH_AES_CFB            0x00010000
-#define BENCH_AES_OFB            0x00020000
-/* Digest algorithms. */
-#define BENCH_MD5                0x00000001
-#define BENCH_POLY1305           0x00000002
-#define BENCH_SHA                0x00000004
-#define BENCH_SHA224             0x00000010
-#define BENCH_SHA256             0x00000020
-#define BENCH_SHA384             0x00000040
-#define BENCH_SHA512             0x00000080
-#define BENCH_SHA2               (BENCH_SHA224 | BENCH_SHA256 | \
-                                  BENCH_SHA384 | BENCH_SHA512)
-#define BENCH_SHA3_224           0x00000100
-#define BENCH_SHA3_256           0x00000200
-#define BENCH_SHA3_384           0x00000400
-#define BENCH_SHA3_512           0x00000800
-#define BENCH_SHA3               (BENCH_SHA3_224 | BENCH_SHA3_256 | \
-                                  BENCH_SHA3_384 | BENCH_SHA3_512)
-#define BENCH_RIPEMD             0x00001000
-#define BENCH_BLAKE2B            0x00002000
-#define BENCH_BLAKE2S            0x00004000
-
-/* MAC algorithms. */
-#define BENCH_CMAC               0x00000001
-#define BENCH_HMAC_MD5           0x00000002
-#define BENCH_HMAC_SHA           0x00000004
-#define BENCH_HMAC_SHA224        0x00000010
-#define BENCH_HMAC_SHA256        0x00000020
-#define BENCH_HMAC_SHA384        0x00000040
-#define BENCH_HMAC_SHA512        0x00000080
-#define BENCH_HMAC               (BENCH_HMAC_MD5    | BENCH_HMAC_SHA    | \
-                                  BENCH_HMAC_SHA224 | BENCH_HMAC_SHA256 | \
-                                  BENCH_HMAC_SHA384 | BENCH_HMAC_SHA512)
-#define BENCH_PBKDF2             0x00000100
-
-/* Asymmetric algorithms. */
-#define BENCH_RSA_KEYGEN         0x00000001
-#define BENCH_RSA                0x00000002
-#define BENCH_RSA_SZ             0x00000004
-#define BENCH_DH                 0x00000010
-#define BENCH_NTRU               0x00000100
-#define BENCH_NTRU_KEYGEN        0x00000200
-#define BENCH_ECC_MAKEKEY        0x00001000
-#define BENCH_ECC                0x00002000
-#define BENCH_ECC_ENCRYPT        0x00004000
-#define BENCH_CURVE25519_KEYGEN  0x00010000
-#define BENCH_CURVE25519_KA      0x00020000
-#define BENCH_ED25519_KEYGEN     0x00040000
-#define BENCH_ED25519_SIGN       0x00080000
-#define BENCH_CURVE448_KEYGEN    0x00100000
-#define BENCH_CURVE448_KA        0x00200000
-#define BENCH_ED448_KEYGEN       0x00400000
-#define BENCH_ED448_SIGN         0x00800000
-/* Other */
-#define BENCH_RNG                0x00000001
-#define BENCH_SCRYPT             0x00000002
-
-
-/* Benchmark all compiled in algorithms.
- * When 1, ignore other benchmark algorithm values.
- *      0, only benchmark algorithm values set.
- */
-static int bench_all = 1;
-/* Cipher algorithms to benchmark. */
-static int bench_cipher_algs = 0;
-/* Digest algorithms to benchmark. */
-static int bench_digest_algs = 0;
-/* MAC algorithms to benchmark. */
-static int bench_mac_algs = 0;
-/* Asymmetric algorithms to benchmark. */
-static int bench_asym_algs = 0;
-/* Other cryptographic algorithms to benchmark. */
-static int bench_other_algs = 0;
-
-#if !defined(WOLFSSL_BENCHMARK_ALL) && !defined(NO_MAIN_DRIVER)
-
-/* The mapping of command line option to bit values. */
-typedef struct bench_alg {
-    /* Command line option string. */
-    const char* str;
-    /* Bit values to set. */
-    int val;
-} bench_alg;
-
-#ifndef MAIN_NO_ARGS
-/* All recognized cipher algorithm choosing command line options. */
-static const bench_alg bench_cipher_opt[] = {
-    { "-cipher",             -1                      },
-#ifdef HAVE_AES_CBC
-    { "-aes-cbc",            BENCH_AES_CBC           },
-#endif
-#ifdef HAVE_AESGCM
-    { "-aes-gcm",            BENCH_AES_GCM           },
-#endif
-#ifdef WOLFSSL_AES_DIRECT
-    { "-aes-ecb",            BENCH_AES_ECB           },
-#endif
-#ifdef WOLFSSL_AES_XTS
-    { "-aes-xts",            BENCH_AES_XTS           },
-#endif
-#ifdef WOLFSSL_AES_CFB
-    { "-aes-cfb",            BENCH_AES_CFB           },
-#endif
-#ifdef WOLFSSL_AES_OFB
-    { "-aes-ofb",            BENCH_AES_OFB           },
-#endif
-#ifdef WOLFSSL_AES_COUNTER
-    { "-aes-ctr",            BENCH_AES_CTR           },
-#endif
-#ifdef HAVE_AESCCM
-    { "-aes-ccm",            BENCH_AES_CCM           },
-#endif
-#ifdef HAVE_CAMELLIA
-    { "-camellia",           BENCH_CAMELLIA          },
-#endif
-#ifndef NO_RC4
-    { "-arc4",               BENCH_ARC4              },
-#endif
-#ifdef HAVE_HC128
-    { "-hc128",              BENCH_HC128             },
-#endif
-#ifndef NO_RABBIT
-    { "-rabbit",             BENCH_RABBIT            },
-#endif
-#ifdef HAVE_CHACHA
-    { "-chacha20",           BENCH_CHACHA20          },
-#endif
-#if defined(HAVE_CHACHA) && defined(HAVE_POLY1305)
-    { "-chacha20-poly1305",  BENCH_CHACHA20_POLY1305 },
-#endif
-#ifndef NO_DES3
-    { "-des",                BENCH_DES               },
-#endif
-#ifdef HAVE_IDEA
-    { "-idea",               BENCH_IDEA              },
-#endif
-    { NULL, 0}
-};
-
-/* All recognized digest algorithm choosing command line options. */
-static const bench_alg bench_digest_opt[] = {
-    { "-digest",             -1                      },
-#ifndef NO_MD5
-    { "-md5",                BENCH_MD5               },
-#endif
-#ifdef HAVE_POLY1305
-    { "-poly1305",           BENCH_POLY1305          },
-#endif
-#ifndef NO_SHA
-    { "-sha",                BENCH_SHA               },
-#endif
-#if defined(WOLFSSL_SHA224) || !defined(NO_SHA256) || defined(WOLFSSL_SHA384) \
-                                                   || defined(WOLFSSL_SHA512)
-    { "-sha2",               BENCH_SHA2              },
-#endif
-#ifdef WOLFSSL_SHA224
-    { "-sha224",             BENCH_SHA224            },
-#endif
-#ifndef NO_SHA256
-    { "-sha256",             BENCH_SHA256            },
-#endif
-#ifdef WOLFSSL_SHA384
-    { "-sha384",             BENCH_SHA384            },
-#endif
-#ifdef WOLFSSL_SHA512
-    { "-sha512",             BENCH_SHA512            },
-#endif
-#ifdef WOLFSSL_SHA3
-    { "-sha3",               BENCH_SHA3              },
-    #ifndef WOLFSSL_NOSHA3_224
-    { "-sha3-224",           BENCH_SHA3_224          },
-    #endif
-    #ifndef WOLFSSL_NOSHA3_256
-    { "-sha3-256",           BENCH_SHA3_256          },
-    #endif
-    #ifndef WOLFSSL_NOSHA3_384
-    { "-sha3-384",           BENCH_SHA3_384          },
-    #endif
-    #ifndef WOLFSSL_NOSHA3_512
-    { "-sha3-512",           BENCH_SHA3_512          },
-    #endif
-#endif
-#ifdef WOLFSSL_RIPEMD
-    { "-ripemd",             BENCH_RIPEMD            },
-#endif
-#ifdef HAVE_BLAKE2
-    { "-blake2b",            BENCH_BLAKE2B           },
-#endif
-#ifdef HAVE_BLAKE2S
-    { "-blake2s",            BENCH_BLAKE2S           },
-#endif
-    { NULL, 0}
-};
-
-/* All recognized MAC algorithm choosing command line options. */
-static const bench_alg bench_mac_opt[] = {
-    { "-mac",                -1                      },
-#ifdef WOLFSSL_CMAC
-    { "-cmac",               BENCH_CMAC              },
-#endif
-#ifndef NO_HMAC
-    { "-hmac",               BENCH_HMAC              },
-    #ifndef NO_MD5
-    { "-hmac-md5",           BENCH_HMAC_MD5          },
-    #endif
-    #ifndef NO_SHA
-    { "-hmac-sha",           BENCH_HMAC_SHA          },
-    #endif
-    #ifdef WOLFSSL_SHA224
-    { "-hmac-sha224",        BENCH_HMAC_SHA224       },
-    #endif
-    #ifndef NO_SHA256
-    { "-hmac-sha256",        BENCH_HMAC_SHA256       },
-    #endif
-    #ifdef WOLFSSL_SHA384
-    { "-hmac-sha384",        BENCH_HMAC_SHA384       },
-    #endif
-    #ifdef WOLFSSL_SHA512
-    { "-hmac-sha512",        BENCH_HMAC_SHA512       },
-    #endif
-    #ifndef NO_PWDBASED
-    { "-pbkdf2",             BENCH_PBKDF2            },
-    #endif
-#endif
-    { NULL, 0}
-};
-
-/* All recognized asymmetric algorithm choosing command line options. */
-static const bench_alg bench_asym_opt[] = {
-    { "-asym",               -1                      },
-#ifndef NO_RSA
-    #ifdef WOLFSSL_KEY_GEN
-    { "-rsa-kg",             BENCH_RSA_KEYGEN        },
-    #endif
-    { "-rsa",                BENCH_RSA               },
-    { "-rsa-sz",             BENCH_RSA_SZ            },
-#endif
-#ifndef NO_DH
-    { "-dh",                 BENCH_DH                },
-#endif
-#ifdef HAVE_NTRU
-    { "-ntru",               BENCH_NTRU              },
-    { "-ntru-kg",            BENCH_NTRU_KEYGEN       },
-#endif
-#ifdef HAVE_ECC
-    { "-ecc-kg",             BENCH_ECC_MAKEKEY       },
-    { "-ecc",                BENCH_ECC               },
-    #ifdef HAVE_ECC_ENCRYPT
-    { "-ecc-enc",            BENCH_ECC_ENCRYPT       },
-    #endif
-#endif
-#ifdef HAVE_CURVE25519
-    { "-curve25519-kg",      BENCH_CURVE25519_KEYGEN },
-    #ifdef HAVE_CURVE25519_SHARED_SECRET
-    { "-x25519",             BENCH_CURVE25519_KA     },
-    #endif
-#endif
-#ifdef HAVE_ED25519
-    { "-ed25519-kg",         BENCH_ED25519_KEYGEN    },
-    { "-ed25519",            BENCH_ED25519_SIGN      },
-#endif
-#ifdef HAVE_CURVE448
-    { "-curve448-kg",        BENCH_CURVE448_KEYGEN   },
-    #ifdef HAVE_CURVE448_SHARED_SECRET
-    { "-x448",               BENCH_CURVE448_KA       },
-    #endif
-#endif
-#ifdef HAVE_ED448
-    { "-ed448-kg",           BENCH_ED448_KEYGEN      },
-    { "-ed448",              BENCH_ED448_SIGN        },
-#endif
-    { NULL, 0}
-};
-
-/* All recognized other cryptographic algorithm choosing command line options.
- */
-static const bench_alg bench_other_opt[] = {
-    { "-other",              -1                      },
-#ifndef WC_NO_RNG
-    { "-rng",                BENCH_RNG               },
-#endif
-#ifdef HAVE_SCRYPT
-    { "-scrypt",             BENCH_SCRYPT            },
-#endif
-    { NULL, 0}
-};
-#endif /* MAIN_NO_ARGS */
-
-#endif /* !WOLFSSL_BENCHMARK_ALL && !NO_MAIN_DRIVER */
-
-
-#ifdef HAVE_WNR
-    const char* wnrConfigFile = "wnr-example.conf";
-#endif
-
-#if defined(WOLFSSL_MDK_ARM)
-    extern XFILE wolfSSL_fopen(const char *fname, const char *mode);
-    #define fopen wolfSSL_fopen
-#endif
-
-static int lng_index = 0;
-
-#ifndef NO_MAIN_DRIVER
-#ifndef MAIN_NO_ARGS
-static const char* bench_Usage_msg1[][16] = {
-    /* 0 English  */
-    {   "-? <num>    Help, print this usage\n            0: English, 1: Japanese\n",
-        "-csv        Print terminal output in csv format\n",
-        "-base10     Display bytes as power of 10 (eg 1 kB = 1000 Bytes)\n",
-        "-no_aad     No additional authentication data passed.\n",
-        "-dgst_full  Full digest operation performed.\n",
-        "-rsa_sign   Measure RSA sign/verify instead of encrypt/decrypt.\n",
-        "<keySz> -rsa-sz\n            Measure RSA <key size> performance.\n",
-        "-ffhdhe2048 Measure DH using FFDHE 2048-bit parameters.\n",
-        "-ffhdhe3072 Measure DH using FFDHE 3072-bit parameters.\n",
-        "-p256       Measure ECC using P-256 curve.\n",
-        "-p384       Measure ECC using P-384 curve.\n",
-        "-<alg>      Algorithm to benchmark. Available algorithms include:\n",
-        "-lng <num>  Display benchmark result by specified language.\n            0: English, 1: Japanese\n",
-        "<num>       Size of block in bytes\n",
-        "-threads <num> Number of threads to run\n",
-        "-print      Show benchmark stats summary\n"
-    },
-#ifndef NO_MULTIBYTE_PRINT
-    /* 1 Japanese */
-    {   "-? <num>    ヘルプ, 使い方を表示します。\n            0: 英語、 1: 日本語\n",
-        "-csv        csv 形式で端末に出力します。\n",
-        "-base10     バイトを10のべき乗で表示します。(例 1 kB = 1000 Bytes)\n",
-        "-no_aad     追加の認証データを使用しません.\n",
-        "-dgst_full  フルの digest 暗号操作を実施します。\n",
-        "-rsa_sign   暗号/復号化の代わりに RSA の署名/検証を測定します。\n",
-        "<keySz> -rsa-sz\n            RSA <key size> の性能を測定します。\n",
-        "-ffhdhe2048 Measure DH using FFDHE 2048-bit parameters.\n",
-        "-ffhdhe3072 Measure DH using FFDHE 3072-bit parameters.\n",
-        "-p256       Measure ECC using P-256 curve.\n",
-        "-p384       Measure ECC using P-384 curve.\n",
-        "-<alg>      アルゴリズムのベンチマークを実施します。\n            利用可能なアルゴリズムは下記を含みます:\n",
-        "-lng <num>  指定された言語でベンチマーク結果を表示します。\n            0: 英語、 1: 日本語\n",
-        "<num>       ブロックサイズをバイト単位で指定します。\n",
-        "-threads <num> 実行するスレッド数\n",
-        "-print      ベンチマーク統計の要約を表示する\n"
-    },
-#endif
-};
-#endif /* MAIN_NO_ARGS */
-#endif
-
-static const char* bench_result_words1[][4] = {
-    { "took", "seconds" , "Cycles per byte", NULL },           /* 0 English  */
-#ifndef NO_MULTIBYTE_PRINT
-    { "を"   , "秒で処理", "1バイトあたりのサイクル数", NULL },     /* 1 Japanese */
-#endif
-};
-
-#if !defined(NO_RSA) || defined(WOLFSSL_KEY_GEN) || defined(HAVE_NTRU) || \
-    defined(HAVE_ECC) || !defined(NO_DH) || defined(HAVE_ECC_ENCRYPT) || \
-    defined(HAVE_CURVE25519) || defined(HAVE_CURVE25519_SHARED_SECRET)  || \
-    defined(HAVE_ED25519) || defined(HAVE_CURVE448) || \
-    defined(HAVE_CURVE448_SHARED_SECRET) || defined(HAVE_ED448)
-#if defined(HAVE_ECC) || !defined(WOLFSSL_RSA_PUBLIC_ONLY) || \
-    defined(WOLFSSL_PUBLIC_MP) || !defined(NO_DH)
-
-static const char* bench_desc_words[][9] = {
-    /* 0           1          2         3        4        5         6            7            8 */
-    {"public", "private", "key gen", "agree" , "sign", "verify", "encryption", "decryption", NULL}, /* 0 English */
-#ifndef NO_MULTIBYTE_PRINT
-    {"公開鍵", "秘密鍵" ,"鍵生成" , "鍵共有" , "署名", "検証"  , "暗号化"    , "復号化"    , NULL}, /* 1 Japanese */
-#endif
-};
-
-#endif
-#endif
-
-#if defined(__GNUC__) && defined(__x86_64__) && !defined(NO_ASM) && !defined(WOLFSSL_SGX)
-    #define HAVE_GET_CYCLES
-    static WC_INLINE word64 get_intel_cycles(void);
-    static THREAD_LS_T word64 total_cycles;
-    #define INIT_CYCLE_COUNTER
-    #define BEGIN_INTEL_CYCLES total_cycles = get_intel_cycles();
-    #define END_INTEL_CYCLES   total_cycles = get_intel_cycles() - total_cycles;
-    /* s == size in bytes that 1 count represents, normally BENCH_SIZE */
-    #define SHOW_INTEL_CYCLES(b, n, s) \
-        XSNPRINTF(b + XSTRLEN(b), n - XSTRLEN(b), " %s = %6.2f\n", \
-            bench_result_words1[lng_index][2], \
-            count == 0 ? 0 : (float)total_cycles / ((word64)count*s))
-    #define SHOW_INTEL_CYCLES_CSV(b, n, s) \
-        XSNPRINTF(b + XSTRLEN(b), n - XSTRLEN(b), "%.2f,\n", \
-            count == 0 ? 0 : (float)total_cycles / ((word64)count*s))
-#elif defined(LINUX_CYCLE_COUNT)
-    #include <linux/perf_event.h>
-    #include <sys/syscall.h>
-    #include <unistd.h>
-
-    static THREAD_LS_T word64 begin_cycles;
-    static THREAD_LS_T word64 total_cycles;
-    static THREAD_LS_T int cycles = -1;
-    static THREAD_LS_T struct perf_event_attr atr;
-
-    #define INIT_CYCLE_COUNTER do { \
-        atr.type   = PERF_TYPE_HARDWARE; \
-        atr.config = PERF_COUNT_HW_CPU_CYCLES; \
-        cycles = (int)syscall(__NR_perf_event_open, &atr, 0, -1, -1, 0); \
-    } while (0);
-
-    #define BEGIN_INTEL_CYCLES read(cycles, &begin_cycles, sizeof(begin_cycles));
-    #define END_INTEL_CYCLES   do { \
-        read(cycles, &total_cycles, sizeof(total_cycles)); \
-        total_cycles = total_cycles - begin_cycles; \
-    } while (0);
-
-    /* s == size in bytes that 1 count represents, normally BENCH_SIZE */
-    #define SHOW_INTEL_CYCLES(b, n, s) \
-        XSNPRINTF(b + XSTRLEN(b), n - XSTRLEN(b), " %s = %6.2f\n", \
-        bench_result_words1[lng_index][2], \
-            (float)total_cycles / (count*s))
-    #define SHOW_INTEL_CYCLES_CSV(b, n, s) \
-        XSNPRINTF(b + XSTRLEN(b), n - XSTRLEN(b), "%.2f,\n", \
-            (float)total_cycles / (count*s))
-
-#elif defined(SYNERGY_CYCLE_COUNT)
-    #include "hal_data.h"
-    static THREAD_LS_T word64 begin_cycles;
-    static THREAD_LS_T word64 total_cycles;
-
-    #define INIT_CYCLE_COUNTER
-    #define BEGIN_INTEL_CYCLES begin_cycles = DWT->CYCCNT = 0;
-    #define END_INTEL_CYCLES   total_cycles =  DWT->CYCCNT - begin_cycles;
-
-    /* s == size in bytes that 1 count represents, normally BENCH_SIZE */
-    #define SHOW_INTEL_CYCLES(b, n, s) \
-        XSNPRINTF(b + XSTRLEN(b), n - XSTRLEN(b), " %s = %6.2f\n", \
-        bench_result_words1[lng_index][2], \
-            (float)total_cycles / (count*s))
-    #define SHOW_INTEL_CYCLES_CSV(b, n, s) \
-        XSNPRINTF(b + XSTRLEN(b), n - XSTRLEN(b), "%.2f,\n", \
-            (float)total_cycles / (count*s))
-
-#else
-    #define INIT_CYCLE_COUNTER
-    #define BEGIN_INTEL_CYCLES
-    #define END_INTEL_CYCLES
-    #define SHOW_INTEL_CYCLES(b, n, s)     b[XSTRLEN(b)] = '\n'
-    #define SHOW_INTEL_CYCLES_CSV(b, n, s)     b[XSTRLEN(b)] = '\n'
-#endif
-
-/* determine benchmark buffer to use (if NO_FILESYSTEM) */
-#if !defined(USE_CERT_BUFFERS_1024) && !defined(USE_CERT_BUFFERS_2048) && \
-    !defined(USE_CERT_BUFFERS_3072)
-    #define USE_CERT_BUFFERS_2048 /* default to 2048 */
-#endif
-
-#if defined(USE_CERT_BUFFERS_1024) || defined(USE_CERT_BUFFERS_2048) || \
-    defined(USE_CERT_BUFFERS_3072) || !defined(NO_DH)
-    /* include test cert and key buffers for use with NO_FILESYSTEM */
-    #include <wolfssl/certs_test.h>
-#endif
-
-#if defined(HAVE_BLAKE2) || defined(HAVE_BLAKE2S)
-    #include <wolfssl/wolfcrypt/blake2.h>
-#endif
-
-#ifdef _MSC_VER
-    /* 4996 warning to use MS extensions e.g., strcpy_s instead of strncpy */
-    #pragma warning(disable: 4996)
-#endif
-
-
-#ifdef WOLFSSL_CURRTIME_REMAP
-    #define current_time WOLFSSL_CURRTIME_REMAP
-#elif !defined(HAVE_STACK_SIZE)
-    double current_time(int);
-#endif
-
-#if defined(DEBUG_WOLFSSL) && !defined(HAVE_VALGRIND) && \
-        !defined(HAVE_STACK_SIZE)
-#ifdef __cplusplus
-    extern "C" {
-#endif
-    WOLFSSL_API int wolfSSL_Debugging_ON(void);
-    WOLFSSL_API void wolfSSL_Debugging_OFF(void);
-#ifdef __cplusplus
-    }  /* extern "C" */
-#endif
-#endif
-
-#if (!defined(NO_RSA) && !defined(WOLFSSL_RSA_VERIFY_ONLY)) || !defined(NO_DH) \
-                        || defined(WOLFSSL_KEY_GEN) || defined(HAVE_ECC) \
-                        || defined(HAVE_CURVE25519) || defined(HAVE_ED25519) \
-                        || defined(HAVE_CURVE448) || defined(HAVE_ED448)
-    #define HAVE_LOCAL_RNG
-    static THREAD_LS_T WC_RNG gRng;
-#endif
-
-#if defined(HAVE_ED25519) || defined(HAVE_CURVE25519) || \
-    defined(HAVE_CURVE448) || defined(HAVE_ED448) || \
-    defined(HAVE_ECC) || defined(HAVE_NTRU) || !defined(NO_DH) || \
-    !defined(NO_RSA) || defined(HAVE_SCRYPT)
-    #define BENCH_ASYM
-#endif
-
-#if defined(BENCH_ASYM)
-#if defined(HAVE_ECC) || !defined(WOLFSSL_RSA_PUBLIC_ONLY) || \
-                                   defined(WOLFSSL_PUBLIC_MP) || !defined(NO_DH)
-static const char* bench_result_words2[][5] = {
-    { "ops took", "sec"     , "avg" , "ops/sec", NULL },            /* 0 English  */
-#ifndef NO_MULTIBYTE_PRINT
-    { "回処理を", "秒で実施", "平均", "処理/秒", NULL },            /* 1 Japanese */
-#endif
-};
-#endif
-#endif
-
-/* Asynchronous helper macros */
-static THREAD_LS_T int devId = INVALID_DEVID;
-
-#ifdef WOLFSSL_ASYNC_CRYPT
-    static WOLF_EVENT_QUEUE eventQueue;
-
-    #define BENCH_ASYNC_GET_DEV(obj)      (&(obj)->asyncDev)
-    #define BENCH_ASYNC_GET_NAME(doAsync) (doAsync) ? "HW" : "SW"
-    #define BENCH_MAX_PENDING             (WOLF_ASYNC_MAX_PENDING)
-
-#ifndef WC_NO_ASYNC_THREADING
-    typedef struct ThreadData {
-        pthread_t thread_id;
-    } ThreadData;
-    static ThreadData* g_threadData;
-    static int g_threadCount;
-#endif
-
-    static int bench_async_check(int* ret, WC_ASYNC_DEV* asyncDev,
-        int callAgain, int* times, int limit, int* pending)
-    {
-        int allowNext = 0;
-
-        /* this state can be set from a different thread */
-        WOLF_EVENT_STATE state = asyncDev->event.state;
-
-        /* if algo doesn't require calling again then use this flow */
-        if (state == WOLF_EVENT_STATE_DONE) {
-            if (callAgain) {
-                /* needs called again, so allow it and handle completion in bench_async_handle */
-                allowNext = 1;
-            }
-            else {
-                *ret = asyncDev->event.ret;
-                asyncDev->event.state = WOLF_EVENT_STATE_READY;
-                (*times)++;
-                if (*pending > 0) /* to support case where async blocks */
-                    (*pending)--;
-
-                if ((*times + *pending) < limit)
-                    allowNext = 1;
-            }
-        }
-
-        /* if slot is available and we haven't reached limit, start another */
-        else if (state == WOLF_EVENT_STATE_READY && (*times + *pending) < limit) {
-            allowNext = 1;
-        }
-
-        return allowNext;
-    }
-
-    static int bench_async_handle(int* ret, WC_ASYNC_DEV* asyncDev,
-        int callAgain, int* times, int* pending)
-    {
-        WOLF_EVENT_STATE state = asyncDev->event.state;
-
-        if (*ret == WC_PENDING_E) {
-            if (state == WOLF_EVENT_STATE_DONE) {
-                *ret = asyncDev->event.ret;
-                asyncDev->event.state = WOLF_EVENT_STATE_READY;
-                (*times)++;
-                (*pending)--;
-            }
-            else {
-                (*pending)++;
-                *ret = wc_AsyncHandle(asyncDev, &eventQueue,
-                    callAgain ? WC_ASYNC_FLAG_CALL_AGAIN : WC_ASYNC_FLAG_NONE);
-            }
-        }
-        else if (*ret >= 0) {
-            *ret = asyncDev->event.ret;
-            asyncDev->event.state = WOLF_EVENT_STATE_READY;
-            (*times)++;
-            if (*pending > 0)  /* to support case where async blocks */
-                (*pending)--;
-        }
-
-        return (*ret >= 0) ? 1 : 0;
-    }
-
-    static WC_INLINE int bench_async_poll(int* pending)
-    {
-        int ret, asyncDone = 0;
-
-        ret = wolfAsync_EventQueuePoll(&eventQueue, NULL, NULL, 0,
-                                       WOLF_POLL_FLAG_CHECK_HW, &asyncDone);
-        if (ret != 0) {
-            printf("Async poll failed %d\n", ret);
-            return ret;
-        }
-
-        if (asyncDone == 0) {
-        #ifndef WC_NO_ASYNC_THREADING
-            /* give time to other threads */
-            wc_AsyncThreadYield();
-        #endif
-        }
-
-        (void)pending;
-
-        return asyncDone;
-    }
-
-#else
-    #define BENCH_MAX_PENDING             (1)
-    #define BENCH_ASYNC_GET_NAME(doAsync) ""
-    #define BENCH_ASYNC_GET_DEV(obj)      NULL
-
-    static WC_INLINE int bench_async_check(int* ret, void* asyncDev,
-        int callAgain, int* times, int limit, int* pending)
-    {
-        (void)ret;
-        (void)asyncDev;
-        (void)callAgain;
-        (void)times;
-        (void)limit;
-        (void)pending;
-
-        return 1;
-    }
-
-    static WC_INLINE int bench_async_handle(int* ret, void* asyncDev,
-        int callAgain, int* times, int* pending)
-    {
-        (void)asyncDev;
-        (void)callAgain;
-        (void)pending;
-
-        if (*ret >= 0) {
-            /* operation completed */
-            (*times)++;
-            return 1;
-        }
-        return 0;
-    }
-    #define bench_async_poll(p)
-#endif /* WOLFSSL_ASYNC_CRYPT */
-
-
-
-/* maximum runtime for each benchmark */
-#define BENCH_MIN_RUNTIME_SEC   1.0f
-
-
-#if defined(HAVE_AESGCM) || defined(HAVE_AESCCM)
-    #define AES_AUTH_ADD_SZ 13
-    #define AES_AUTH_TAG_SZ 16
-    #define BENCH_CIPHER_ADD AES_AUTH_TAG_SZ
-    static word32 aesAuthAddSz = AES_AUTH_ADD_SZ;
-#endif
-#ifndef BENCH_CIPHER_ADD
-    #define BENCH_CIPHER_ADD 0
-#endif
-
-
-/* use kB instead of mB for embedded benchmarking */
-#ifdef BENCH_EMBEDDED
-    enum BenchmarkBounds {
-        scryptCnt  = 1,
-        ntimes     = 2,
-        genTimes   = BENCH_MAX_PENDING,
-        agreeTimes = 2
-    };
-    static int    numBlocks  = 25; /* how many kB to test (en/de)cryption */
-    static word32 bench_size = (1024ul);
-#else
-    enum BenchmarkBounds {
-        scryptCnt  = 10,
-        ntimes     = 100,
-        genTimes   = BENCH_MAX_PENDING, /* must be at least BENCH_MAX_PENDING */
-        agreeTimes = 100
-    };
-    static int    numBlocks  = 5; /* how many megs to test (en/de)cryption */
-    static word32 bench_size = (1024*1024ul);
-#endif
-static int base2 = 1;
-static int digest_stream = 1;
-#ifndef NO_RSA
-/* Don't measure RSA sign/verify by default */
-static int rsa_sign_verify = 0;
-#endif
-#ifndef NO_DH
-/* Use the FFDHE parameters */
-static int use_ffdhe = 0;
-#endif
-
-/* Don't print out in CSV format by default */
-static int csv_format = 0;
-#ifdef BENCH_ASYM
-static int csv_header_count = 0;
-#endif
-
-/* for compatibility */
-#define BENCH_SIZE bench_size
-
-/* globals for cipher tests */
-static THREAD_LS_T byte* bench_plain = NULL;
-static THREAD_LS_T byte* bench_cipher = NULL;
-
-static const XGEN_ALIGN byte bench_key_buf[] =
-{
-    0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,
-    0xfe,0xde,0xba,0x98,0x76,0x54,0x32,0x10,
-    0x89,0xab,0xcd,0xef,0x01,0x23,0x45,0x67,
-    0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef
-};
-
-static const XGEN_ALIGN byte bench_iv_buf[] =
-{
-    0x12,0x34,0x56,0x78,0x90,0xab,0xcd,0xef,
-    0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,
-    0x11,0x21,0x31,0x41,0x51,0x61,0x71,0x81
-};
-static THREAD_LS_T byte* bench_key = NULL;
-static THREAD_LS_T byte* bench_iv = NULL;
-
-#ifdef WOLFSSL_STATIC_MEMORY
-    #ifdef BENCH_EMBEDDED
-        static byte gBenchMemory[50000];
-    #else
-        static byte gBenchMemory[400000];
-    #endif
-#endif
-
-
-/* This code handles cases with systems where static (non cost) ram variables
-    aren't properly initialized with data */
-static int gBenchStaticInit = 0;
-static void benchmark_static_init(void)
-{
-    if (gBenchStaticInit == 0) {
-        gBenchStaticInit = 1;
-
-        /* Init static variables */
-        bench_all = 1;
-    #ifdef BENCH_EMBEDDED
-        numBlocks  = 25; /* how many kB to test (en/de)cryption */
-        bench_size = (1024ul);
-    #else
-        numBlocks  = 5; /* how many megs to test (en/de)cryption */
-        bench_size = (1024*1024ul);
-    #endif
-    #if defined(HAVE_AESGCM) || defined(HAVE_AESCCM)
-        aesAuthAddSz = AES_AUTH_ADD_SZ;
-    #endif
-        base2 = 1;
-        digest_stream = 1;
-    }
-}
-
-
-
-/******************************************************************************/
-/* Begin Stats Functions */
-/******************************************************************************/
-static int gPrintStats = 0;
-typedef enum bench_stat_type {
-    BENCH_STAT_ASYM,
-    BENCH_STAT_SYM,
-} bench_stat_type_t;
-#if defined(WOLFSSL_ASYNC_CRYPT) && !defined(WC_NO_ASYNC_THREADING)
-    typedef struct bench_stats {
-        struct bench_stats* next;
-        struct bench_stats* prev;
-        const char* algo;
-        const char* desc;
-        double perfsec;
-        int strength;
-        int doAsync;
-        int finishCount;
-        bench_stat_type_t type;
-        int lastRet;
-        const char* perftype;
-    } bench_stats_t;
-    static bench_stats_t* bench_stats_head;
-    static bench_stats_t* bench_stats_tail;
-    static pthread_mutex_t bench_lock = PTHREAD_MUTEX_INITIALIZER;
-
-    static bench_stats_t* bench_stats_add(bench_stat_type_t type,
-        const char* algo, int strength, const char* desc, int doAsync,
-        double perfsec, const char* perftype, int ret)
-    {
-        bench_stats_t* bstat;
-
-        /* protect bench_stats_head and bench_stats_tail access */
-        pthread_mutex_lock(&bench_lock);
-
-        /* locate existing in list */
-        for (bstat = bench_stats_head; bstat != NULL; bstat = bstat->next) {
-            /* match based on algo, strength and desc */
-            if (bstat->algo == algo && bstat->strength == strength && bstat->desc == desc && bstat->doAsync == doAsync) {
-                break;
-            }
-        }
-
-        if (bstat == NULL) {
-            /* allocate new and put on list */
-            bstat = (bench_stats_t*)XMALLOC(sizeof(bench_stats_t), NULL, DYNAMIC_TYPE_INFO);
-            if (bstat) {
-                XMEMSET(bstat, 0, sizeof(bench_stats_t));
-
-                /* add to list */
-                bstat->next = NULL;
-                if (bench_stats_tail == NULL)  {
-                    bench_stats_head = bstat;
-                }
-                else {
-                    bench_stats_tail->next = bstat;
-                    bstat->prev = bench_stats_tail;
-                }
-                bench_stats_tail = bstat; /* add to the end either way */
-            }
-        }
-
-        if (bstat) {
-            bstat->type = type;
-            bstat->algo = algo;
-            bstat->strength = strength;
-            bstat->desc = desc;
-            bstat->doAsync = doAsync;
-            bstat->perfsec += perfsec;
-            bstat->finishCount++;
-            bstat->perftype = perftype;
-            if (bstat->lastRet > ret)
-                bstat->lastRet = ret; /* track last error */
-
-            pthread_mutex_unlock(&bench_lock);
-
-            /* wait until remaining are complete */
-            while (bstat->finishCount < g_threadCount) {
-                wc_AsyncThreadYield();
-            }
-        }
-        else {
-            pthread_mutex_unlock(&bench_lock);
-        }
-
-        return bstat;
-    }
-
-    void bench_stats_print(void)
-    {
-        bench_stats_t* bstat;
-
-        /* protect bench_stats_head and bench_stats_tail access */
-        pthread_mutex_lock(&bench_lock);
-
-        for (bstat = bench_stats_head; bstat != NULL; ) {
-            if (bstat->type == BENCH_STAT_SYM) {
-                printf("%-16s%s %8.3f %s/s\n", bstat->desc,
-                    BENCH_ASYNC_GET_NAME(bstat->doAsync), bstat->perfsec,
-                    base2 ? "MB" : "mB");
-            }
-            else {
-                printf("%-5s %4d %-9s %s %.3f ops/sec\n",
-                    bstat->algo, bstat->strength, bstat->desc,
-                    BENCH_ASYNC_GET_NAME(bstat->doAsync), bstat->perfsec);
-            }
-
-            bstat = bstat->next;
-        }
-
-        pthread_mutex_unlock(&bench_lock);
-    }
-
-#else
-
-    typedef struct bench_stats {
-        const char* algo;
-        const char* desc;
-        double perfsec;
-        const char* perftype;
-        int strength;
-        bench_stat_type_t type;
-        int ret;
-    } bench_stats_t;
-    #define MAX_BENCH_STATS 50
-    static bench_stats_t gStats[MAX_BENCH_STATS];
-    static int gStatsCount;
-
-    static bench_stats_t* bench_stats_add(bench_stat_type_t type,
-            const char* algo, int strength, const char* desc, int doAsync,
-            double perfsec, const char* perftype, int ret)
-    {
-        bench_stats_t* bstat = NULL;
-        if (gStatsCount >= MAX_BENCH_STATS)
-            return bstat;
-
-        bstat = &gStats[gStatsCount++];
-        bstat->algo = algo;
-        bstat->desc = desc;
-        bstat->perfsec = perfsec;
-        bstat->perftype = perftype;
-        bstat->strength = strength;
-        bstat->type = type;
-        bstat->ret = ret;
-
-        (void)doAsync;
-
-        return bstat;
-    }
-
-    void bench_stats_print(void)
-    {
-        int i;
-        bench_stats_t* bstat;
-        for (i=0; i<gStatsCount; i++) {
-            bstat = &gStats[i];
-            if (bstat->type == BENCH_STAT_SYM) {
-                printf("%-16s %8.3f %s/s\n", bstat->desc, bstat->perfsec,
-                    base2 ? "MB" : "mB");
-            }
-            else {
-                printf("%-5s %4d %-9s %.3f ops/sec\n",
-                    bstat->algo, bstat->strength, bstat->desc, bstat->perfsec);
-            }
-        }
-    }
-#endif /* WOLFSSL_ASYNC_CRYPT && !WC_NO_ASYNC_THREADING */
-
-static WC_INLINE void bench_stats_init(void)
-{
-#if defined(WOLFSSL_ASYNC_CRYPT) && !defined(WC_NO_ASYNC_THREADING)
-    bench_stats_head = NULL;
-    bench_stats_tail = NULL;
-#endif
-    INIT_CYCLE_COUNTER
-}
-
-static WC_INLINE void bench_stats_start(int* count, double* start)
-{
-    *count = 0;
-    *start = current_time(1);
-    BEGIN_INTEL_CYCLES
-}
-
-static WC_INLINE int bench_stats_sym_check(double start)
-{
-    return ((current_time(0) - start) < BENCH_MIN_RUNTIME_SEC);
-}
-
-
-/* countSz is number of bytes that 1 count represents. Normally bench_size,
- * except for AES direct that operates on AES_BLOCK_SIZE blocks */
-static void bench_stats_sym_finish(const char* desc, int doAsync, int count,
-                                   int countSz, double start, int ret)
-{
-    double total, persec = 0, blocks = count;
-    const char* blockType;
-    char msg[128] = {0};
-    const char** word = bench_result_words1[lng_index];
-
-    END_INTEL_CYCLES
-    total = current_time(0) - start;
-
-    /* calculate actual bytes */
-    blocks *= countSz;
-
-    if (base2) {
-        /* determine if we should show as KB or MB */
-        if (blocks > (1024ul * 1024ul)) {
-            blocks /= (1024ul * 1024ul);
-            blockType = "MB";
-        }
-        else if (blocks > 1024) {
-            blocks /= 1024; /* make KB */
-            blockType = "KB";
-        }
-        else {
-            blockType = "bytes";
-        }
-    }
-    else {
-        /* determine if we should show as kB or mB */
-        if (blocks > (1000ul * 1000ul)) {
-            blocks /= (1000ul * 1000ul);
-            blockType = "mB";
-        }
-        else if (blocks > 1000) {
-            blocks /= 1000; /* make kB */
-            blockType = "kB";
-        }
-        else {
-            blockType = "bytes";
-        }
-    }
-
-    /* caclulcate blocks per second */
-    if (total > 0) {
-        persec = (1 / total) * blocks;
-    }
-
-    /* format and print to terminal */
-    if (csv_format == 1) {
-        XSNPRINTF(msg, sizeof(msg), "%s,%.3f,", desc, persec);
-        SHOW_INTEL_CYCLES_CSV(msg, sizeof(msg), countSz);
-    } else {
-        XSNPRINTF(msg, sizeof(msg), "%-16s%s %5.0f %s %s %5.3f %s, %8.3f %s/s",
-        desc, BENCH_ASYNC_GET_NAME(doAsync), blocks, blockType, word[0], total, word[1],
-        persec, blockType);
-        SHOW_INTEL_CYCLES(msg, sizeof(msg), countSz);
-    }
-    printf("%s", msg);
-
-    /* show errors */
-    if (ret < 0) {
-        printf("Benchmark %s failed: %d\n", desc, ret);
-    }
-
-    /* Add to thread stats */
-    bench_stats_add(BENCH_STAT_SYM, NULL, 0, desc, doAsync, persec, blockType, ret);
-
-    (void)doAsync;
-    (void)ret;
-
-    TEST_SLEEP();
-}
-
-#ifdef BENCH_ASYM
-#if defined(HAVE_ECC) || !defined(WOLFSSL_RSA_PUBLIC_ONLY) || \
-                                   defined(WOLFSSL_PUBLIC_MP) || !defined(NO_DH)
-static void bench_stats_asym_finish(const char* algo, int strength,
-    const char* desc, int doAsync, int count, double start, int ret)
-{
-    double total, each = 0, opsSec, milliEach;
-    const char **word = bench_result_words2[lng_index];
-    const char* kOpsSec = "Ops/Sec";
-    char msg[128] = {0};
-
-    total = current_time(0) - start;
-    if (count > 0)
-        each  = total / count; /* per second  */
-    opsSec = count / total;    /* ops second */
-    milliEach = each * 1000;   /* milliseconds */
-
-    /* format and print to terminal */
-    if (csv_format == 1) {
-        /* only print out header once */
-        if (csv_header_count == 1) {
-            printf("\nAsymmetric Ciphers:\n\n");
-            printf("Algorithm,avg ms,ops/sec,\n");
-            csv_header_count++;
-        }
-        XSNPRINTF(msg, sizeof(msg), "%s %d %s,%.3f,%.3f,\n", algo, strength, desc, milliEach, opsSec);
-    } else {
-        XSNPRINTF(msg, sizeof(msg), "%-6s %5d %-9s %s %6d %s %5.3f %s, %s %5.3f ms,"
-        " %.3f %s\n", algo, strength, desc, BENCH_ASYNC_GET_NAME(doAsync),
-        count, word[0], total, word[1], word[2], milliEach, opsSec, word[3]);
-    }
-    printf("%s", msg);
-
-    /* show errors */
-    if (ret < 0) {
-        printf("Benchmark %s %s %d failed: %d\n", algo, desc, strength, ret);
-    }
-
-    /* Add to thread stats */
-    bench_stats_add(BENCH_STAT_ASYM, algo, strength, desc, doAsync, opsSec, kOpsSec, ret);
-
-    (void)doAsync;
-    (void)ret;
-
-    TEST_SLEEP();
-}
-#endif
-#endif /* BENCH_ASYM */
-
-static WC_INLINE void bench_stats_free(void)
-{
-#if defined(WOLFSSL_ASYNC_CRYPT) && !defined(WC_NO_ASYNC_THREADING)
-    bench_stats_t* bstat;
-    for (bstat = bench_stats_head; bstat != NULL; ) {
-        bench_stats_t* next = bstat->next;
-        XFREE(bstat, NULL, DYNAMIC_TYPE_INFO);
-        bstat = next;
-    }
-    bench_stats_head = NULL;
-    bench_stats_tail = NULL;
-#endif
-}
-/******************************************************************************/
-/* End Stats Functions */
-/******************************************************************************/
-
-
-static void* benchmarks_do(void* args)
-{
-    int bench_buf_size;
-
-#ifdef WOLFSSL_ASYNC_CRYPT
-#ifndef WC_NO_ASYNC_THREADING
-    ThreadData* threadData = (ThreadData*)args;
-
-    if (wolfAsync_DevOpenThread(&devId, &threadData->thread_id) < 0)
-#else
-    if (wolfAsync_DevOpen(&devId) < 0)
-#endif
-    {
-        printf("Async device open failed\nRunning without async\n");
-    }
-#endif /* WOLFSSL_ASYNC_CRYPT */
-
-    (void)args;
-
-#ifdef WOLFSSL_ASYNC_CRYPT
-    if (wolfEventQueue_Init(&eventQueue) != 0) {
-        printf("Async event queue init failure!\n");
-    }
-#endif
-
-#ifdef WOLF_CRYPTO_CB
-#ifdef HAVE_INTEL_QA_SYNC
-    devId = wc_CryptoCb_InitIntelQa();
-    if (devId == INVALID_DEVID) {
-        printf("Couldn't init the Intel QA\n");
-    }
-#endif
-#ifdef HAVE_CAVIUM_OCTEON_SYNC
-    devId = wc_CryptoCb_InitOcteon();
-    if (devId == INVALID_DEVID) {
-        printf("Couldn't get the Octeon device ID\n");
-    }
-#endif
-#endif
-
-#if defined(HAVE_LOCAL_RNG)
-    {
-        int rngRet;
-
-#ifndef HAVE_FIPS
-        rngRet = wc_InitRng_ex(&gRng, HEAP_HINT, devId);
-#else
-        rngRet = wc_InitRng(&gRng);
-#endif
-        if (rngRet < 0) {
-            printf("InitRNG failed\n");
-            return NULL;
-        }
-    }
-#endif
-
-    /* setup bench plain, cipher, key and iv globals */
-    /* make sure bench buffer is multiple of 16 (AES block size) */
-    bench_buf_size = (int)bench_size + BENCH_CIPHER_ADD;
-    if (bench_buf_size % 16)
-        bench_buf_size += 16 - (bench_buf_size % 16);
-
-#ifdef WOLFSSL_AFALG_XILINX_AES
-    bench_plain = (byte*)aligned_alloc(64, (size_t)bench_buf_size + 16);
-    bench_cipher = (byte*)aligned_alloc(64, (size_t)bench_buf_size + 16);
-#else
-    bench_plain = (byte*)XMALLOC((size_t)bench_buf_size + 16, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
-    bench_cipher = (byte*)XMALLOC((size_t)bench_buf_size + 16, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
-#endif
-    if (bench_plain == NULL || bench_cipher == NULL) {
-        XFREE(bench_plain, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
-        XFREE(bench_cipher, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
-        bench_plain = bench_cipher = NULL;
-
-        printf("Benchmark block buffer alloc failed!\n");
-        goto exit;
-    }
-    XMEMSET(bench_plain, 0, (size_t)bench_buf_size);
-    XMEMSET(bench_cipher, 0, (size_t)bench_buf_size);
-
-#if defined(WOLFSSL_ASYNC_CRYPT) || defined(HAVE_INTEL_QA_SYNC)
-    bench_key = (byte*)XMALLOC(sizeof(bench_key_buf), HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
-    bench_iv = (byte*)XMALLOC(sizeof(bench_iv_buf), HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
-    if (bench_key == NULL || bench_iv == NULL) {
-        XFREE(bench_key, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
-        XFREE(bench_iv, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
-        bench_key = bench_iv = NULL;
-
-        printf("Benchmark cipher buffer alloc failed!\n");
-        goto exit;
-    }
-    XMEMCPY(bench_key, bench_key_buf, sizeof(bench_key_buf));
-    XMEMCPY(bench_iv, bench_iv_buf, sizeof(bench_iv_buf));
-#else
-    bench_key = (byte*)bench_key_buf;
-    bench_iv = (byte*)bench_iv_buf;
-#endif
-
-#ifndef WC_NO_RNG
-    if (bench_all || (bench_other_algs & BENCH_RNG))
-        bench_rng();
-#endif /* WC_NO_RNG */
-#ifndef NO_AES
-#ifdef HAVE_AES_CBC
-    if (bench_all || (bench_cipher_algs & BENCH_AES_CBC)) {
-    #ifndef NO_SW_BENCH
-        bench_aescbc(0);
-    #endif
-    #if ((defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_3DES)) || \
-         defined(HAVE_INTEL_QA_SYNC) || defined(HAVE_CAVIUM_OCTEON_SYNC)) && \
-        !defined(NO_HW_BENCH)
-        bench_aescbc(1);
-    #endif
-    }
-#endif
-#ifdef HAVE_AESGCM
-    if (bench_all || (bench_cipher_algs & BENCH_AES_GCM)) {
-    #ifndef NO_SW_BENCH
-        bench_aesgcm(0);
-    #endif
-    #if ((defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_3DES)) || \
-         defined(HAVE_INTEL_QA_SYNC) || defined(HAVE_CAVIUM_OCTEON_SYNC)) && \
-        !defined(NO_HW_BENCH)
-        bench_aesgcm(1);
-    #endif
-    }
-#endif
-#ifdef WOLFSSL_AES_DIRECT
-    if (bench_all || (bench_cipher_algs & BENCH_AES_ECB)) {
-    #ifndef NO_SW_BENCH
-        bench_aesecb(0);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_AES) && \
-        !defined(NO_HW_BENCH)
-        bench_aesecb(1);
-    #endif
-    }
-#endif
-#ifdef WOLFSSL_AES_XTS
-    if (bench_all || (bench_cipher_algs & BENCH_AES_XTS))
-        bench_aesxts();
-#endif
-#ifdef WOLFSSL_AES_CFB
-    if (bench_all || (bench_cipher_algs & BENCH_AES_CFB))
-        bench_aescfb();
-#endif
-#ifdef WOLFSSL_AES_OFB
-    if (bench_all || (bench_cipher_algs & BENCH_AES_OFB))
-        bench_aesofb();
-#endif
-#ifdef WOLFSSL_AES_COUNTER
-    if (bench_all || (bench_cipher_algs & BENCH_AES_CTR))
-        bench_aesctr();
-#endif
-#ifdef HAVE_AESCCM
-    if (bench_all || (bench_cipher_algs & BENCH_AES_CCM))
-        bench_aesccm();
-#endif
-#endif /* !NO_AES */
-
-#ifdef HAVE_CAMELLIA
-    if (bench_all || (bench_cipher_algs & BENCH_CAMELLIA))
-        bench_camellia();
-#endif
-#ifndef NO_RC4
-    if (bench_all || (bench_cipher_algs & BENCH_ARC4)) {
-    #ifndef NO_SW_BENCH
-        bench_arc4(0);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_ARC4) && \
-        !defined(NO_HW_BENCH)
-        bench_arc4(1);
-    #endif
-    }
-#endif
-#ifdef HAVE_HC128
-    if (bench_all || (bench_cipher_algs & BENCH_HC128))
-        bench_hc128();
-#endif
-#ifndef NO_RABBIT
-    if (bench_all || (bench_cipher_algs & BENCH_RABBIT))
-        bench_rabbit();
-#endif
-#ifdef HAVE_CHACHA
-    if (bench_all || (bench_cipher_algs & BENCH_CHACHA20))
-        bench_chacha();
-#endif
-#if defined(HAVE_CHACHA) && defined(HAVE_POLY1305)
-    if (bench_all || (bench_cipher_algs & BENCH_CHACHA20_POLY1305))
-        bench_chacha20_poly1305_aead();
-#endif
-#ifndef NO_DES3
-    if (bench_all || (bench_cipher_algs & BENCH_DES)) {
-    #ifndef NO_SW_BENCH
-        bench_des(0);
-    #endif
-    #if ((defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_3DES)) || \
-         defined(HAVE_INTEL_QA_SYNC) || defined(HAVE_CAVIUM_OCTEON_SYNC)) && \
-        !defined(NO_HW_BENCH)
-        bench_des(1);
-    #endif
-    }
-#endif
-#ifdef HAVE_IDEA
-    if (bench_all || (bench_cipher_algs & BENCH_IDEA))
-        bench_idea();
-#endif
-
-#ifndef NO_MD5
-    if (bench_all || (bench_digest_algs & BENCH_MD5)) {
-    #ifndef NO_SW_BENCH
-        bench_md5(0);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_MD5) && \
-        !defined(NO_HW_BENCH)
-        bench_md5(1);
-    #endif
-    }
-#endif
-#ifdef HAVE_POLY1305
-    if (bench_all || (bench_digest_algs & BENCH_POLY1305))
-        bench_poly1305();
-#endif
-#ifndef NO_SHA
-    if (bench_all || (bench_digest_algs & BENCH_SHA)) {
-    #ifndef NO_SW_BENCH
-        bench_sha(0);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_SHA) && \
-        !defined(NO_HW_BENCH)
-        bench_sha(1);
-    #endif
-    }
-#endif
-#ifdef WOLFSSL_SHA224
-    if (bench_all || (bench_digest_algs & BENCH_SHA224)) {
-    #ifndef NO_SW_BENCH
-        bench_sha224(0);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_SHA224) && \
-        !defined(NO_HW_BENCH)
-        bench_sha224(1);
-    #endif
-    }
-#endif
-#ifndef NO_SHA256
-    if (bench_all || (bench_digest_algs & BENCH_SHA256)) {
-    #ifndef NO_SW_BENCH
-        bench_sha256(0);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_SHA256) && \
-        !defined(NO_HW_BENCH)
-        bench_sha256(1);
-    #endif
-    }
-#endif
-#ifdef WOLFSSL_SHA384
-    if (bench_all || (bench_digest_algs & BENCH_SHA384)) {
-    #ifndef NO_SW_BENCH
-        bench_sha384(0);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_SHA384) && \
-        !defined(NO_HW_BENCH)
-        bench_sha384(1);
-    #endif
-    }
-#endif
-#ifdef WOLFSSL_SHA512
-    if (bench_all || (bench_digest_algs & BENCH_SHA512)) {
-    #ifndef NO_SW_BENCH
-        bench_sha512(0);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_SHA512) && \
-        !defined(NO_HW_BENCH)
-        bench_sha512(1);
-    #endif
-    }
-#endif
-#ifdef WOLFSSL_SHA3
-    #ifndef WOLFSSL_NOSHA3_224
-    if (bench_all || (bench_digest_algs & BENCH_SHA3_224)) {
-    #ifndef NO_SW_BENCH
-        bench_sha3_224(0);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_SHA3) && \
-        !defined(NO_HW_BENCH)
-        bench_sha3_224(1);
-    #endif
-    }
-    #endif /* WOLFSSL_NOSHA3_224 */
-    #ifndef WOLFSSL_NOSHA3_256
-    if (bench_all || (bench_digest_algs & BENCH_SHA3_256)) {
-    #ifndef NO_SW_BENCH
-        bench_sha3_256(0);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_SHA3) && \
-        !defined(NO_HW_BENCH)
-        bench_sha3_256(1);
-    #endif
-    }
-    #endif /* WOLFSSL_NOSHA3_256 */
-    #ifndef WOLFSSL_NOSHA3_384
-    if (bench_all || (bench_digest_algs & BENCH_SHA3_384)) {
-    #ifndef NO_SW_BENCH
-        bench_sha3_384(0);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_SHA3) && \
-        !defined(NO_HW_BENCH)
-        bench_sha3_384(1);
-    #endif
-    }
-    #endif /* WOLFSSL_NOSHA3_384 */
-    #ifndef WOLFSSL_NOSHA3_512
-    if (bench_all || (bench_digest_algs & BENCH_SHA3_512)) {
-    #ifndef NO_SW_BENCH
-        bench_sha3_512(0);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_SHA3) && \
-        !defined(NO_HW_BENCH)
-        bench_sha3_512(1);
-    #endif
-    }
-    #endif /* WOLFSSL_NOSHA3_512 */
-#endif
-#ifdef WOLFSSL_RIPEMD
-    if (bench_all || (bench_digest_algs & BENCH_RIPEMD))
-        bench_ripemd();
-#endif
-#ifdef HAVE_BLAKE2
-    if (bench_all || (bench_digest_algs & BENCH_BLAKE2B))
-        bench_blake2b();
-#endif
-#ifdef HAVE_BLAKE2S
-    if (bench_all || (bench_digest_algs & BENCH_BLAKE2S))
-        bench_blake2s();
-#endif
-#ifdef WOLFSSL_CMAC
-    if (bench_all || (bench_mac_algs & BENCH_CMAC))
-        bench_cmac();
-#endif
-
-#ifndef NO_HMAC
-    #ifndef NO_MD5
-        if (bench_all || (bench_mac_algs & BENCH_HMAC_MD5)) {
-        #ifndef NO_SW_BENCH
-            bench_hmac_md5(0);
-        #endif
-        #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_HMAC) && \
-                defined(WC_ASYNC_ENABLE_MD5) && !defined(NO_HW_BENCH)
-            bench_hmac_md5(1);
-        #endif
-        }
-    #endif
-    #ifndef NO_SHA
-        if (bench_all || (bench_mac_algs & BENCH_HMAC_SHA)) {
-        #ifndef NO_SW_BENCH
-            bench_hmac_sha(0);
-        #endif
-        #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_HMAC) && \
-                defined(WC_ASYNC_ENABLE_SHA) && !defined(NO_HW_BENCH)
-            bench_hmac_sha(1);
-        #endif
-        }
-    #endif
-    #ifdef WOLFSSL_SHA224
-        if (bench_all || (bench_mac_algs & BENCH_HMAC_SHA224)) {
-        #ifndef NO_SW_BENCH
-            bench_hmac_sha224(0);
-        #endif
-        #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_HMAC) && \
-                defined(WC_ASYNC_ENABLE_SHA224) && !defined(NO_HW_BENCH)
-            bench_hmac_sha224(1);
-        #endif
-        }
-    #endif
-    #ifndef NO_SHA256
-        if (bench_all || (bench_mac_algs & BENCH_HMAC_SHA256)) {
-        #ifndef NO_SW_BENCH
-            bench_hmac_sha256(0);
-        #endif
-        #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_HMAC) && \
-                defined(WC_ASYNC_ENABLE_SHA256) && !defined(NO_HW_BENCH)
-            bench_hmac_sha256(1);
-        #endif
-        }
-    #endif
-    #ifdef WOLFSSL_SHA384
-        if (bench_all || (bench_mac_algs & BENCH_HMAC_SHA384)) {
-        #ifndef NO_SW_BENCH
-            bench_hmac_sha384(0);
-        #endif
-        #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_HMAC) && \
-                defined(WC_ASYNC_ENABLE_SHA384) && !defined(NO_HW_BENCH)
-            bench_hmac_sha384(1);
-        #endif
-        }
-    #endif
-    #ifdef WOLFSSL_SHA512
-        if (bench_all || (bench_mac_algs & BENCH_HMAC_SHA512)) {
-        #ifndef NO_SW_BENCH
-            bench_hmac_sha512(0);
-        #endif
-        #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_HMAC) && \
-                defined(WC_ASYNC_ENABLE_SHA512) && !defined(NO_HW_BENCH)
-            bench_hmac_sha512(1);
-        #endif
-        }
-    #endif
-    #ifndef NO_PWDBASED
-        if (bench_all || (bench_mac_algs & BENCH_PBKDF2)) {
-            bench_pbkdf2();
-        }
-    #endif
-#endif /* NO_HMAC */
-
-#ifdef HAVE_SCRYPT
-    if (bench_all || (bench_other_algs & BENCH_SCRYPT))
-        bench_scrypt();
-#endif
-
-#ifndef NO_RSA
-    #ifdef WOLFSSL_KEY_GEN
-        if (bench_all || (bench_asym_algs & BENCH_RSA_KEYGEN)) {
-        #ifndef NO_SW_BENCH
-            if (bench_asym_algs & BENCH_RSA_SZ) {
-                bench_rsaKeyGen_size(0, bench_size);
-            }
-            else {
-                bench_rsaKeyGen(0);
-            }
-        #endif
-        #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_RSA_KEYGEN) \
-                && !defined(NO_HW_BENCH)
-            if (bench_asym_algs & BENCH_RSA_SZ) {
-                bench_rsaKeyGen_size(1, bench_size);
-            }
-            else {
-                bench_rsaKeyGen(1);
-            }
-        #endif
-        }
-    #endif
-    if (bench_all || (bench_asym_algs & BENCH_RSA)) {
-    #ifndef NO_SW_BENCH
-        bench_rsa(0);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_RSA) && \
-        !defined(NO_HW_BENCH)
-        bench_rsa(1);
-    #endif
-    }
-
-    #ifdef WOLFSSL_KEY_GEN
-    if (bench_asym_algs & BENCH_RSA_SZ) {
-    #ifndef NO_SW_BENCH
-        bench_rsa_key(0, bench_size);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_RSA) && \
-        !defined(NO_HW_BENCH)
-        bench_rsa_key(1, bench_size);
-    #endif
-    }
-    #endif
-#endif
-
-#ifndef NO_DH
-    if (bench_all || (bench_asym_algs & BENCH_DH)) {
-    #ifndef NO_SW_BENCH
-        bench_dh(0);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_DH) && \
-        !defined(NO_HW_BENCH)
-        bench_dh(1);
-    #endif
-    }
-#endif
-
-#ifdef HAVE_NTRU
-    if (bench_all || (bench_asym_algs & BENCH_NTRU))
-        bench_ntru();
-    if (bench_all || (bench_asym_algs & BENCH_NTRU_KEYGEN))
-        bench_ntruKeyGen();
-#endif
-
-#ifdef HAVE_ECC
-    if (bench_all || (bench_asym_algs & BENCH_ECC_MAKEKEY)) {
-    #ifndef NO_SW_BENCH
-        bench_eccMakeKey(0);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_ECC) && \
-        !defined(NO_HW_BENCH)
-        bench_eccMakeKey(1);
-    #endif
-    }
-    if (bench_all || (bench_asym_algs & BENCH_ECC)) {
-    #ifndef NO_SW_BENCH
-        bench_ecc(0);
-    #endif
-    #if defined(WOLFSSL_ASYNC_CRYPT) && defined(WC_ASYNC_ENABLE_ECC) && \
-        !defined(NO_HW_BENCH)
-        bench_ecc(1);
-    #endif
-    }
-    #ifdef HAVE_ECC_ENCRYPT
-    if (bench_all || (bench_asym_algs & BENCH_ECC_ENCRYPT))
-        bench_eccEncrypt();
-    #endif
-#endif
-
-#ifdef HAVE_CURVE25519
-    if (bench_all || (bench_asym_algs & BENCH_CURVE25519_KEYGEN))
-        bench_curve25519KeyGen();
-    #ifdef HAVE_CURVE25519_SHARED_SECRET
-    if (bench_all || (bench_asym_algs & BENCH_CURVE25519_KA))
-        bench_curve25519KeyAgree();
-    #endif
-#endif
-
-#ifdef HAVE_ED25519
-    if (bench_all || (bench_asym_algs & BENCH_ED25519_KEYGEN))
-        bench_ed25519KeyGen();
-    if (bench_all || (bench_asym_algs & BENCH_ED25519_SIGN))
-        bench_ed25519KeySign();
-#endif
-
-#ifdef HAVE_CURVE448
-    if (bench_all || (bench_asym_algs & BENCH_CURVE448_KEYGEN))
-        bench_curve448KeyGen();
-    #ifdef HAVE_CURVE448_SHARED_SECRET
-    if (bench_all || (bench_asym_algs & BENCH_CURVE448_KA))
-        bench_curve448KeyAgree();
-    #endif
-#endif
-
-#ifdef HAVE_ED448
-    if (bench_all || (bench_asym_algs & BENCH_ED448_KEYGEN))
-        bench_ed448KeyGen();
-    if (bench_all || (bench_asym_algs & BENCH_ED448_SIGN))
-        bench_ed448KeySign();
-#endif
-
-exit:
-    /* free benchmark buffers */
-    XFREE(bench_plain, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
-    XFREE(bench_cipher, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
-#ifdef WOLFSSL_ASYNC_CRYPT
-    XFREE(bench_key, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
-    XFREE(bench_iv, HEAP_HINT, DYNAMIC_TYPE_WOLF_BIGINT);
-#endif
-
-#ifdef WOLF_CRYPTO_CB
-#ifdef HAVE_INTEL_QA_SYNC
-    wc_CryptoCb_CleanupIntelQa(&devId);
-#endif
-#ifdef HAVE_CAVIUM_OCTEON_SYNC
-    wc_CryptoCb_CleanupOcteon(&devId);
-#endif
-#endif
-
-#ifdef WOLFSSL_ASYNC_CRYPT
-    /* free event queue */
-    wolfEventQueue_Free(&eventQueue);
-#endif
-
-#if defined(HAVE_LOCAL_RNG)
-    wc_FreeRng(&gRng);
-#endif
-
-#ifdef WOLFSSL_ASYNC_CRYPT
-    wolfAsync_DevClose(&devId);
-#endif
-
-/* cleanup the thread if fixed point cache is enabled and have thread local */
-#if defined(HAVE_THREAD_LS) && defined(HAVE_ECC) && defined(FP_ECC)
-    wc_ecc_fp_free();
-#endif
-
-    (void)bench_cipher_algs;
-    (void)bench_digest_algs;
-    (void)bench_mac_algs;
-    (void)bench_asym_algs;
-    (void)bench_other_algs;
-
-    return NULL;
-}
-
-int benchmark_init(void)
-{
-    int ret = 0;
-
-    benchmark_static_init();
-
-#ifdef WOLFSSL_STATIC_MEMORY
-    ret = wc_LoadStaticMemory(&HEAP_HINT, gBenchMemory, sizeof(gBenchMemory),
-                                                            WOLFMEM_GENERAL, 1);
-    if (ret != 0) {
-        printf("unable to load static memory %d\n", ret);
-    }
-#endif /* WOLFSSL_STATIC_MEMORY */
-
-    if ((ret = wolfCrypt_Init()) != 0) {
-        printf("wolfCrypt_Init failed %d\n", ret);
-        return EXIT_FAILURE;
-    }
-
-    bench_stats_init();
-
-#if defined(DEBUG_WOLFSSL) && !defined(HAVE_VALGRIND)
-    wolfSSL_Debugging_ON();
-#endif
-
-    if (csv_format == 1) {
-        printf("wolfCrypt Benchmark (block bytes %d, min %.1f sec each)\n",
-        (int)BENCH_SIZE, BENCH_MIN_RUNTIME_SEC);
-        printf("This format allows you to easily copy the output to a csv file.");
-        printf("\n\nSymmetric Ciphers:\n\n");
-        printf("Algorithm,MB/s,Cycles per byte,\n");
-    } else {
-        printf("wolfCrypt Benchmark (block bytes %d, min %.1f sec each)\n",
-        (int)BENCH_SIZE, BENCH_MIN_RUNTIME_SEC);
-    }
-
-#ifdef HAVE_WNR
-    ret = wc_InitNetRandom(wnrConfigFile, NULL, 5000);
-    if (ret != 0) {
-        printf("Whitewood netRandom config init failed %d\n", ret);
-    }
-#endif /* HAVE_WNR */
-
-    return ret;
-}
-
-int benchmark_free(void)
-{
-    int ret;
-
-#ifdef HAVE_WNR
-    ret = wc_FreeNetRandom();
-    if (ret < 0) {
-        printf("Failed to free netRandom context %d\n", ret);
-    }
-#endif
-
-    if (gPrintStats || devId != INVALID_DEVID) {
-        bench_stats_print();
-    }
-
-    bench_stats_free();
-
-    if ((ret = wolfCrypt_Cleanup()) != 0) {
-        printf("error %d with wolfCrypt_Cleanup\n", ret);
-    }
-
-    return ret;
-}
-
-/* so embedded projects can pull in tests on their own */
-#ifdef HAVE_STACK_SIZE
-THREAD_RETURN WOLFSSL_THREAD benchmark_test(void* args)
-#else
-int benchmark_test(void *args)
-#endif
-{
-    int ret;
-
-    (void)args;
-
-    printf("------------------------------------------------------------------------------\n");
-    printf(" wolfSSL version %s\n", LIBWOLFSSL_VERSION_STRING);
-    printf("------------------------------------------------------------------------------\n");
-
-    ret = benchmark_init();
-    if (ret != 0)
-        EXIT_TEST(ret);
-
-#if defined(WOLFSSL_ASYNC_CRYPT) && !defined(WC_NO_ASYNC_THREADING)
-{
-    int i;
-
-    if (g_threadCount == 0) {
-    #ifdef WC_ASYNC_BENCH_THREAD_COUNT
-        g_threadCount = WC_ASYNC_BENCH_THREAD_COUNT;
-    #else
-        g_threadCount = wc_AsyncGetNumberOfCpus();
-    #endif
-    }
-
-    printf("CPUs: %d\n", g_threadCount);
-
-    g_threadData = (ThreadData*)XMALLOC(sizeof(ThreadData) * g_threadCount,
-        HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
-    if (g_threadData == NULL) {
-        printf("Thread data alloc failed!\n");
-        EXIT_TEST(EXIT_FAILURE);
-    }
-
-    /* Create threads */
-    for (i = 0; i < g_threadCount; i++) {
-        ret = wc_AsyncThreadCreate(&g_threadData[i].thread_id,
-            benchmarks_do, &g_threadData[i]);
-        if (ret != 0) {
-            printf("Error creating benchmark thread %d\n", ret);
-            EXIT_TEST(EXIT_FAILURE);
-        }
-    }
-
-    /* Start threads */
-    for (i = 0; i < g_threadCount; i++) {
-        wc_AsyncThreadJoin(&g_threadData[i].thread_id);
-    }
-
-    XFREE(g_threadData, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
-}
-#else
-    benchmarks_do(NULL);
-#endif
-
-    printf("Benchmark complete\n");
-
-    ret = benchmark_free();
-
-    EXIT_TEST(ret);
-}
-
-
-#ifndef WC_NO_RNG
-void bench_rng(void)
-{
-    int    ret, i, count;
-    double start;
-    long   pos, len, remain;
-    WC_RNG myrng;
-
-#ifndef HAVE_FIPS
-    ret = wc_InitRng_ex(&myrng, HEAP_HINT, devId);
-#else
-    ret = wc_InitRng(&myrng);
-#endif
-    if (ret < 0) {
-        printf("InitRNG failed %d\n", ret);
-        return;
-    }
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < numBlocks; i++) {
-            /* Split request to handle large RNG request */
-            pos = 0;
-            remain = (int)BENCH_SIZE;
-            while (remain > 0) {
-                len = remain;
-                if (len > RNG_MAX_BLOCK_LEN)
-                    len = RNG_MAX_BLOCK_LEN;
-                ret = wc_RNG_GenerateBlock(&myrng, &bench_plain[pos], (word32)len);
-                if (ret < 0)
-                    goto exit_rng;
-
-                remain -= len;
-                pos += len;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-exit_rng:
-    bench_stats_sym_finish("RNG", 0, count, bench_size, start, ret);
-
-    wc_FreeRng(&myrng);
-}
-#endif /* WC_NO_RNG */
-
-
-#ifndef NO_AES
-
-#ifdef HAVE_AES_CBC
-static void bench_aescbc_internal(int doAsync, const byte* key, word32 keySz,
-                                  const byte* iv, const char* encLabel,
-                                  const char* decLabel)
-{
-    int    ret = 0, i, count = 0, times, pending = 0;
-    Aes    enc[BENCH_MAX_PENDING];
-    double start;
-
-    /* clear for done cleanup */
-    XMEMSET(enc, 0, sizeof(enc));
-
-    /* init keys */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        if ((ret = wc_AesInit(&enc[i], HEAP_HINT,
-                                doAsync ? devId : INVALID_DEVID)) != 0) {
-            printf("AesInit failed, ret = %d\n", ret);
-            goto exit;
-        }
-
-        ret = wc_AesSetKey(&enc[i], key, keySz, iv, AES_ENCRYPTION);
-        if (ret != 0) {
-            printf("AesSetKey failed, ret = %d\n", ret);
-            goto exit;
-        }
-    }
-
-    bench_stats_start(&count, &start);
-    do {
-        for (times = 0; times < numBlocks || pending > 0; ) {
-            bench_async_poll(&pending);
-
-            /* while free pending slots in queue, submit ops */
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&enc[i]), 0, &times, numBlocks, &pending)) {
-                    ret = wc_AesCbcEncrypt(&enc[i], bench_plain, bench_cipher,
-                        BENCH_SIZE);
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&enc[i]), 0, &times, &pending)) {
-                        goto exit_aes_enc;
-                    }
-                }
-            } /* for i */
-        } /* for times */
-        count += times;
-    } while (bench_stats_sym_check(start));
-exit_aes_enc:
-    bench_stats_sym_finish(encLabel, doAsync, count, bench_size, start, ret);
-
-    if (ret < 0) {
-        goto exit;
-    }
-
-#ifdef HAVE_AES_DECRYPT
-    /* init keys */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        ret = wc_AesSetKey(&enc[i], key, keySz, iv, AES_DECRYPTION);
-        if (ret != 0) {
-            printf("AesSetKey failed, ret = %d\n", ret);
-            goto exit;
-        }
-    }
-
-    bench_stats_start(&count, &start);
-    do {
-        for (times = 0; times < numBlocks || pending > 0; ) {
-            bench_async_poll(&pending);
-
-            /* while free pending slots in queue, submit ops */
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&enc[i]), 0, &times, numBlocks, &pending)) {
-                    ret = wc_AesCbcDecrypt(&enc[i], bench_plain, bench_cipher,
-                        BENCH_SIZE);
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&enc[i]), 0, &times, &pending)) {
-                        goto exit_aes_dec;
-                    }
-                }
-            } /* for i */
-        } /* for times */
-        count += times;
-    } while (bench_stats_sym_check(start));
-exit_aes_dec:
-    bench_stats_sym_finish(decLabel, doAsync, count, bench_size, start, ret);
-
-#endif /* HAVE_AES_DECRYPT */
-
-    (void)decLabel;
-exit:
-
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_AesFree(&enc[i]);
-    }
-}
-
-void bench_aescbc(int doAsync)
-{
-#ifdef WOLFSSL_AES_128
-    bench_aescbc_internal(doAsync, bench_key, 16, bench_iv,
-                 "AES-128-CBC-enc", "AES-128-CBC-dec");
-#endif
-#ifdef WOLFSSL_AES_192
-    bench_aescbc_internal(doAsync, bench_key, 24, bench_iv,
-                 "AES-192-CBC-enc", "AES-192-CBC-dec");
-#endif
-#ifdef WOLFSSL_AES_256
-    bench_aescbc_internal(doAsync, bench_key, 32, bench_iv,
-                 "AES-256-CBC-enc", "AES-256-CBC-dec");
-#endif
-}
-
-#endif /* HAVE_AES_CBC */
-
-#ifdef HAVE_AESGCM
-static void bench_aesgcm_internal(int doAsync, const byte* key, word32 keySz,
-                                  const byte* iv, word32 ivSz,
-                                  const char* encLabel, const char* decLabel)
-{
-    int    ret = 0, i, count = 0, times, pending = 0;
-    Aes    enc[BENCH_MAX_PENDING];
-#ifdef HAVE_AES_DECRYPT
-    Aes    dec[BENCH_MAX_PENDING];
-#endif
-    double start;
-
-    DECLARE_VAR(bench_additional, byte, AES_AUTH_ADD_SZ, HEAP_HINT);
-    DECLARE_VAR(bench_tag, byte, AES_AUTH_TAG_SZ, HEAP_HINT);
-
-    /* clear for done cleanup */
-    XMEMSET(enc, 0, sizeof(enc));
-#ifdef HAVE_AES_DECRYPT
-    XMEMSET(dec, 0, sizeof(dec));
-#endif
-#ifdef WOLFSSL_ASYNC_CRYPT
-    if (bench_additional)
-#endif
-        XMEMSET(bench_additional, 0, AES_AUTH_ADD_SZ);
-#ifdef WOLFSSL_ASYNC_CRYPT
-    if (bench_tag)
-#endif
-        XMEMSET(bench_tag, 0, AES_AUTH_TAG_SZ);
-
-    /* init keys */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        if ((ret = wc_AesInit(&enc[i], HEAP_HINT,
-                        doAsync ? devId : INVALID_DEVID)) != 0) {
-            printf("AesInit failed, ret = %d\n", ret);
-            goto exit;
-        }
-
-        ret = wc_AesGcmSetKey(&enc[i], key, keySz);
-        if (ret != 0) {
-            printf("AesGcmSetKey failed, ret = %d\n", ret);
-            goto exit;
-        }
-    }
-
-    /* GCM uses same routine in backend for both encrypt and decrypt */
-    bench_stats_start(&count, &start);
-    do {
-        for (times = 0; times < numBlocks || pending > 0; ) {
-            bench_async_poll(&pending);
-
-            /* while free pending slots in queue, submit ops */
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&enc[i]), 0, &times, numBlocks, &pending)) {
-                    ret = wc_AesGcmEncrypt(&enc[i], bench_cipher,
-                        bench_plain, BENCH_SIZE,
-                        iv, ivSz, bench_tag, AES_AUTH_TAG_SZ,
-                        bench_additional, aesAuthAddSz);
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&enc[i]), 0, &times, &pending)) {
-                        goto exit_aes_gcm;
-                    }
-                }
-            } /* for i */
-        } /* for times */
-        count += times;
-    } while (bench_stats_sym_check(start));
-exit_aes_gcm:
-    bench_stats_sym_finish(encLabel, doAsync, count, bench_size, start, ret);
-
-#ifdef HAVE_AES_DECRYPT
-    /* init keys */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        if ((ret = wc_AesInit(&dec[i], HEAP_HINT,
-                        doAsync ? devId : INVALID_DEVID)) != 0) {
-            printf("AesInit failed, ret = %d\n", ret);
-            goto exit;
-        }
-
-        ret = wc_AesGcmSetKey(&dec[i], key, keySz);
-        if (ret != 0) {
-            printf("AesGcmSetKey failed, ret = %d\n", ret);
-            goto exit;
-        }
-    }
-
-    bench_stats_start(&count, &start);
-    do {
-        for (times = 0; times < numBlocks || pending > 0; ) {
-            bench_async_poll(&pending);
-
-            /* while free pending slots in queue, submit ops */
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&dec[i]), 0, &times, numBlocks, &pending)) {
-                    ret = wc_AesGcmDecrypt(&dec[i], bench_plain,
-                        bench_cipher, BENCH_SIZE,
-                        iv, ivSz, bench_tag, AES_AUTH_TAG_SZ,
-                        bench_additional, aesAuthAddSz);
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&dec[i]), 0, &times, &pending)) {
-                        goto exit_aes_gcm_dec;
-                    }
-                }
-            } /* for i */
-        } /* for times */
-        count += times;
-    } while (bench_stats_sym_check(start));
-exit_aes_gcm_dec:
-    bench_stats_sym_finish(decLabel, doAsync, count, bench_size, start, ret);
-#endif /* HAVE_AES_DECRYPT */
-
-    (void)decLabel;
-
-exit:
-
-    if (ret < 0) {
-        printf("bench_aesgcm failed: %d\n", ret);
-    }
-#ifdef HAVE_AES_DECRYPT
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_AesFree(&dec[i]);
-    }
-#endif
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_AesFree(&enc[i]);
-    }
-
-    FREE_VAR(bench_additional, HEAP_HINT);
-    FREE_VAR(bench_tag, HEAP_HINT);
-}
-
-void bench_aesgcm(int doAsync)
-{
-#if defined(WOLFSSL_AES_128) && !defined(WOLFSSL_AFALG_XILINX_AES)
-    bench_aesgcm_internal(doAsync, bench_key, 16, bench_iv, 12,
-                          "AES-128-GCM-enc", "AES-128-GCM-dec");
-#endif
-#if defined(WOLFSSL_AES_192) && !defined(WOLFSSL_AFALG_XILINX_AES)
-    bench_aesgcm_internal(doAsync, bench_key, 24, bench_iv, 12,
-                          "AES-192-GCM-enc", "AES-192-GCM-dec");
-#endif
-#ifdef WOLFSSL_AES_256
-    bench_aesgcm_internal(doAsync, bench_key, 32, bench_iv, 12,
-                          "AES-256-GCM-enc", "AES-256-GCM-dec");
-#endif
-}
-#endif /* HAVE_AESGCM */
-
-
-#ifdef WOLFSSL_AES_DIRECT
-static void bench_aesecb_internal(int doAsync, const byte* key, word32 keySz,
-                                  const char* encLabel, const char* decLabel)
-{
-    int    ret, i, count = 0, times, pending = 0;
-    Aes    enc[BENCH_MAX_PENDING];
-    double start;
-
-    /* clear for done cleanup */
-    XMEMSET(enc, 0, sizeof(enc));
-
-    /* init keys */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        if ((ret = wc_AesInit(&enc[i], HEAP_HINT,
-                                doAsync ? devId : INVALID_DEVID)) != 0) {
-            printf("AesInit failed, ret = %d\n", ret);
-            goto exit;
-        }
-
-        ret = wc_AesSetKey(&enc[i], key, keySz, bench_iv, AES_ENCRYPTION);
-        if (ret != 0) {
-            printf("AesSetKey failed, ret = %d\n", ret);
-            goto exit;
-        }
-    }
-
-    bench_stats_start(&count, &start);
-    do {
-        for (times = 0; times < numBlocks || pending > 0; ) {
-            bench_async_poll(&pending);
-
-            /* while free pending slots in queue, submit ops */
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&enc[i]), 0, &times, numBlocks, &pending)) {
-                    wc_AesEncryptDirect(&enc[i], bench_cipher, bench_plain);
-                    ret = 0;
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&enc[i]), 0, &times, &pending)) {
-                        goto exit_aes_enc;
-                    }
-                }
-            } /* for i */
-        } /* for times */
-        count += times;
-    } while (bench_stats_sym_check(start));
-exit_aes_enc:
-    bench_stats_sym_finish(encLabel, doAsync, count, AES_BLOCK_SIZE,
-                           start, ret);
-
-#ifdef HAVE_AES_DECRYPT
-    /* init keys */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        ret = wc_AesSetKey(&enc[i], key, keySz, bench_iv, AES_DECRYPTION);
-        if (ret != 0) {
-            printf("AesSetKey failed, ret = %d\n", ret);
-            goto exit;
-        }
-    }
-
-    bench_stats_start(&count, &start);
-    do {
-        for (times = 0; times < numBlocks || pending > 0; ) {
-            bench_async_poll(&pending);
-
-            /* while free pending slots in queue, submit ops */
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&enc[i]), 0, &times, numBlocks, &pending)) {
-                    wc_AesDecryptDirect(&enc[i], bench_plain,
-                                              bench_cipher);
-                    ret = 0;
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&enc[i]), 0, &times, &pending)) {
-                        goto exit_aes_dec;
-                    }
-                }
-            } /* for i */
-        } /* for times */
-        count += times;
-    } while (bench_stats_sym_check(start));
-exit_aes_dec:
-    bench_stats_sym_finish(decLabel, doAsync, count, AES_BLOCK_SIZE,
-                           start, ret);
-
-#endif /* HAVE_AES_DECRYPT */
-
-exit:
-
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_AesFree(&enc[i]);
-    }
-}
-
-void bench_aesecb(int doAsync)
-{
-#ifdef WOLFSSL_AES_128
-    bench_aesecb_internal(doAsync, bench_key, 16,
-                 "AES-128-ECB-enc", "AES-128-ECB-dec");
-#endif
-#ifdef WOLFSSL_AES_192
-    bench_aesecb_internal(doAsync, bench_key, 24,
-                 "AES-192-ECB-enc", "AES-192-ECB-dec");
-#endif
-#ifdef WOLFSSL_AES_256
-    bench_aesecb_internal(doAsync, bench_key, 32,
-                 "AES-256-ECB-enc", "AES-256-ECB-dec");
-#endif
-}
-#endif /* WOLFSSL_AES_DIRECT */
-
-#ifdef WOLFSSL_AES_CFB
-static void bench_aescfb_internal(const byte* key, word32 keySz, const byte* iv,
-                                  const char* label)
-{
-    Aes    enc;
-    double start;
-    int    i, ret, count;
-
-    ret = wc_AesSetKey(&enc, key, keySz, iv, AES_ENCRYPTION);
-    if (ret != 0) {
-        printf("AesSetKey failed, ret = %d\n", ret);
-        return;
-    }
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < numBlocks; i++) {
-            if((ret = wc_AesCfbEncrypt(&enc, bench_plain, bench_cipher,
-                            BENCH_SIZE)) != 0) {
-                printf("wc_AesCfbEncrypt failed, ret = %d\n", ret);
-                return;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_sym_finish(label, 0, count, bench_size, start, ret);
-}
-
-void bench_aescfb(void)
-{
-#ifdef WOLFSSL_AES_128
-    bench_aescfb_internal(bench_key, 16, bench_iv, "AES-128-CFB");
-#endif
-#ifdef WOLFSSL_AES_192
-    bench_aescfb_internal(bench_key, 24, bench_iv, "AES-192-CFB");
-#endif
-#ifdef WOLFSSL_AES_256
-    bench_aescfb_internal(bench_key, 32, bench_iv, "AES-256-CFB");
-#endif
-}
-#endif /* WOLFSSL_AES_CFB */
-
-
-#ifdef WOLFSSL_AES_OFB
-static void bench_aesofb_internal(const byte* key, word32 keySz, const byte* iv,
-                                  const char* label)
-{
-    Aes    enc;
-    double start;
-    int    i, ret, count;
-
-    ret = wc_AesSetKey(&enc, key, keySz, iv, AES_ENCRYPTION);
-    if (ret != 0) {
-        printf("AesSetKey failed, ret = %d\n", ret);
-        return;
-    }
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < numBlocks; i++) {
-            if((ret = wc_AesOfbEncrypt(&enc, bench_plain, bench_cipher,
-                            BENCH_SIZE)) != 0) {
-                printf("wc_AesCfbEncrypt failed, ret = %d\n", ret);
-                return;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_sym_finish(label, 0, count, bench_size, start, ret);
-}
-
-void bench_aesofb(void)
-{
-#ifdef WOLFSSL_AES_128
-    bench_aesofb_internal(bench_key, 16, bench_iv, "AES-128-OFB");
-#endif
-#ifdef WOLFSSL_AES_192
-    bench_aesofb_internal(bench_key, 24, bench_iv, "AES-192-OFB");
-#endif
-#ifdef WOLFSSL_AES_256
-    bench_aesofb_internal(bench_key, 32, bench_iv, "AES-256-OFB");
-#endif
-}
-#endif /* WOLFSSL_AES_CFB */
-
-
-#ifdef WOLFSSL_AES_XTS
-void bench_aesxts(void)
-{
-    XtsAes aes;
-    double start;
-    int    i, count, ret;
-
-    static unsigned char k1[] = {
-        0xa1, 0xb9, 0x0c, 0xba, 0x3f, 0x06, 0xac, 0x35,
-        0x3b, 0x2c, 0x34, 0x38, 0x76, 0x08, 0x17, 0x62,
-        0x09, 0x09, 0x23, 0x02, 0x6e, 0x91, 0x77, 0x18,
-        0x15, 0xf2, 0x9d, 0xab, 0x01, 0x93, 0x2f, 0x2f
-    };
-
-    static unsigned char i1[] = {
-        0x4f, 0xae, 0xf7, 0x11, 0x7c, 0xda, 0x59, 0xc6,
-        0x6e, 0x4b, 0x92, 0x01, 0x3e, 0x76, 0x8a, 0xd5
-    };
-
-    ret = wc_AesXtsSetKey(&aes, k1, sizeof(k1), AES_ENCRYPTION,
-            HEAP_HINT, devId);
-    if (ret != 0) {
-        printf("wc_AesXtsSetKey failed, ret = %d\n", ret);
-        return;
-    }
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < numBlocks; i++) {
-            if ((ret = wc_AesXtsEncrypt(&aes, bench_plain, bench_cipher,
-                            BENCH_SIZE, i1, sizeof(i1))) != 0) {
-                printf("wc_AesXtsEncrypt failed, ret = %d\n", ret);
-                return;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_sym_finish("AES-XTS-enc", 0, count, bench_size, start, ret);
-    wc_AesXtsFree(&aes);
-
-    /* decryption benchmark */
-    ret = wc_AesXtsSetKey(&aes, k1, sizeof(k1), AES_DECRYPTION,
-            HEAP_HINT, devId);
-    if (ret != 0) {
-        printf("wc_AesXtsSetKey failed, ret = %d\n", ret);
-        return;
-    }
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < numBlocks; i++) {
-            if ((ret = wc_AesXtsDecrypt(&aes, bench_plain, bench_cipher,
-                            BENCH_SIZE, i1, sizeof(i1))) != 0) {
-                printf("wc_AesXtsDecrypt failed, ret = %d\n", ret);
-                return;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_sym_finish("AES-XTS-dec", 0, count, bench_size, start, ret);
-    wc_AesXtsFree(&aes);
-}
-#endif /* WOLFSSL_AES_XTS */
-
-
-#ifdef WOLFSSL_AES_COUNTER
-static void bench_aesctr_internal(const byte* key, word32 keySz, const byte* iv,
-                                  const char* label)
-{
-    Aes    enc;
-    double start;
-    int    i, count, ret = 0;
-
-    wc_AesSetKeyDirect(&enc, key, keySz, iv, AES_ENCRYPTION);
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < numBlocks; i++) {
-            if((ret = wc_AesCtrEncrypt(&enc, bench_plain, bench_cipher, BENCH_SIZE)) != 0) {
-                printf("wc_AesCtrEncrypt failed, ret = %d\n", ret);
-                return;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_sym_finish(label, 0, count, bench_size, start, ret);
-}
-
-void bench_aesctr(void)
-{
-#ifdef WOLFSSL_AES_128
-    bench_aesctr_internal(bench_key, 16, bench_iv, "AES-128-CTR");
-#endif
-#ifdef WOLFSSL_AES_192
-    bench_aesctr_internal(bench_key, 24, bench_iv, "AES-192-CTR");
-#endif
-#ifdef WOLFSSL_AES_256
-    bench_aesctr_internal(bench_key, 32, bench_iv, "AES-256-CTR");
-#endif
-}
-#endif /* WOLFSSL_AES_COUNTER */
-
-
-#ifdef HAVE_AESCCM
-void bench_aesccm(void)
-{
-    Aes    enc;
-    double start;
-    int    ret, i, count;
-
-    DECLARE_VAR(bench_additional, byte, AES_AUTH_ADD_SZ, HEAP_HINT);
-    DECLARE_VAR(bench_tag, byte, AES_AUTH_TAG_SZ, HEAP_HINT);
-
-    XMEMSET(bench_tag, 0, AES_AUTH_TAG_SZ);
-    XMEMSET(bench_additional, 0, AES_AUTH_ADD_SZ);
-
-    if ((ret = wc_AesCcmSetKey(&enc, bench_key, 16)) != 0) {
-        printf("wc_AesCcmSetKey failed, ret = %d\n", ret);
-        return;
-    }
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < numBlocks; i++) {
-            wc_AesCcmEncrypt(&enc, bench_cipher, bench_plain, BENCH_SIZE,
-                bench_iv, 12, bench_tag, AES_AUTH_TAG_SZ,
-                bench_additional, aesAuthAddSz);
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_sym_finish("AES-CCM-Enc", 0, count, bench_size, start, ret);
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < numBlocks; i++) {
-            wc_AesCcmDecrypt(&enc, bench_plain, bench_cipher, BENCH_SIZE,
-                bench_iv, 12, bench_tag, AES_AUTH_TAG_SZ,
-                bench_additional, aesAuthAddSz);
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_sym_finish("AES-CCM-Dec", 0, count, bench_size, start, ret);
-
-
-    FREE_VAR(bench_additional, HEAP_HINT);
-    FREE_VAR(bench_tag, HEAP_HINT);
-}
-#endif /* HAVE_AESCCM */
-#endif /* !NO_AES */
-
-
-#ifdef HAVE_POLY1305
-void bench_poly1305(void)
-{
-    Poly1305 enc;
-    byte     mac[16];
-    double   start;
-    int      ret = 0, i, count;
-
-    if (digest_stream) {
-        ret = wc_Poly1305SetKey(&enc, bench_key, 32);
-        if (ret != 0) {
-            printf("Poly1305SetKey failed, ret = %d\n", ret);
-            return;
-        }
-
-        bench_stats_start(&count, &start);
-        do {
-            for (i = 0; i < numBlocks; i++) {
-                ret = wc_Poly1305Update(&enc, bench_plain, BENCH_SIZE);
-                if (ret != 0) {
-                    printf("Poly1305Update failed: %d\n", ret);
-                    break;
-                }
-            }
-            wc_Poly1305Final(&enc, mac);
-            count += i;
-        } while (bench_stats_sym_check(start));
-        bench_stats_sym_finish("POLY1305", 0, count, bench_size, start, ret);
-    }
-    else {
-        bench_stats_start(&count, &start);
-        do {
-            for (i = 0; i < numBlocks; i++) {
-                ret = wc_Poly1305SetKey(&enc, bench_key, 32);
-                if (ret != 0) {
-                    printf("Poly1305SetKey failed, ret = %d\n", ret);
-                    return;
-                }
-                ret = wc_Poly1305Update(&enc, bench_plain, BENCH_SIZE);
-                if (ret != 0) {
-                    printf("Poly1305Update failed: %d\n", ret);
-                    break;
-                }
-                wc_Poly1305Final(&enc, mac);
-            }
-            count += i;
-        } while (bench_stats_sym_check(start));
-        bench_stats_sym_finish("POLY1305", 0, count, bench_size, start, ret);
-    }
-}
-#endif /* HAVE_POLY1305 */
-
-
-#ifdef HAVE_CAMELLIA
-void bench_camellia(void)
-{
-    Camellia cam;
-    double   start;
-    int      ret, i, count;
-
-    ret = wc_CamelliaSetKey(&cam, bench_key, 16, bench_iv);
-    if (ret != 0) {
-        printf("CamelliaSetKey failed, ret = %d\n", ret);
-        return;
-    }
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < numBlocks; i++) {
-            ret = wc_CamelliaCbcEncrypt(&cam, bench_plain, bench_cipher,
-                                                            BENCH_SIZE);
-            if (ret < 0) {
-                printf("CamelliaCbcEncrypt failed: %d\n", ret);
-                return;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_sym_finish("Camellia", 0, count, bench_size, start, ret);
-}
-#endif
-
-
-#ifndef NO_DES3
-void bench_des(int doAsync)
-{
-    int    ret = 0, i, count = 0, times, pending = 0;
-    Des3   enc[BENCH_MAX_PENDING];
-    double start;
-
-    /* clear for done cleanup */
-    XMEMSET(enc, 0, sizeof(enc));
-
-    /* init keys */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        if ((ret = wc_Des3Init(&enc[i], HEAP_HINT,
-                                doAsync ? devId : INVALID_DEVID)) != 0) {
-            printf("Des3Init failed, ret = %d\n", ret);
-            goto exit;
-        }
-
-        ret = wc_Des3_SetKey(&enc[i], bench_key, bench_iv, DES_ENCRYPTION);
-        if (ret != 0) {
-            printf("Des3_SetKey failed, ret = %d\n", ret);
-            goto exit;
-        }
-    }
-
-    bench_stats_start(&count, &start);
-    do {
-        for (times = 0; times < numBlocks || pending > 0; ) {
-            bench_async_poll(&pending);
-
-            /* while free pending slots in queue, submit ops */
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&enc[i]), 0, &times, numBlocks, &pending)) {
-                    ret = wc_Des3_CbcEncrypt(&enc[i], bench_plain, bench_cipher,
-                        BENCH_SIZE);
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&enc[i]), 0, &times, &pending)) {
-                        goto exit_3des;
-                    }
-                }
-            } /* for i */
-        } /* for times */
-        count += times;
-    } while (bench_stats_sym_check(start));
-exit_3des:
-    bench_stats_sym_finish("3DES", doAsync, count, bench_size, start, ret);
-
-exit:
-
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_Des3Free(&enc[i]);
-    }
-}
-#endif /* !NO_DES3 */
-
-
-#ifdef HAVE_IDEA
-void bench_idea(void)
-{
-    Idea   enc;
-    double start;
-    int    ret = 0, i, count;
-
-    ret = wc_IdeaSetKey(&enc, bench_key, IDEA_KEY_SIZE, bench_iv,
-        IDEA_ENCRYPTION);
-    if (ret != 0) {
-        printf("Des3_SetKey failed, ret = %d\n", ret);
-        return;
-    }
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < numBlocks; i++) {
-            wc_IdeaCbcEncrypt(&enc, bench_plain, bench_cipher, BENCH_SIZE);
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_sym_finish("IDEA", 0, count, bench_size, start, ret);
-}
-#endif /* HAVE_IDEA */
-
-
-#ifndef NO_RC4
-void bench_arc4(int doAsync)
-{
-    int    ret = 0, i, count = 0, times, pending = 0;
-    Arc4   enc[BENCH_MAX_PENDING];
-    double start;
-
-    /* clear for done cleanup */
-    XMEMSET(enc, 0, sizeof(enc));
-
-    /* init keys */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        if ((ret = wc_Arc4Init(&enc[i], HEAP_HINT,
-                            doAsync ? devId : INVALID_DEVID)) != 0) {
-            printf("Arc4Init failed, ret = %d\n", ret);
-            goto exit;
-        }
-
-        ret = wc_Arc4SetKey(&enc[i], bench_key, 16);
-        if (ret != 0) {
-            printf("Arc4SetKey failed, ret = %d\n", ret);
-            goto exit;
-        }
-    }
-
-    bench_stats_start(&count, &start);
-    do {
-        for (times = 0; times < numBlocks || pending > 0; ) {
-            bench_async_poll(&pending);
-
-            /* while free pending slots in queue, submit ops */
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&enc[i]), 0, &times, numBlocks, &pending)) {
-                    ret = wc_Arc4Process(&enc[i], bench_cipher, bench_plain,
-                        BENCH_SIZE);
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&enc[i]), 0, &times, &pending)) {
-                        goto exit_arc4;
-                    }
-                }
-            } /* for i */
-        } /* for times */
-        count += times;
-    } while (bench_stats_sym_check(start));
-exit_arc4:
-    bench_stats_sym_finish("ARC4", doAsync, count, bench_size, start, ret);
-
-exit:
-
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_Arc4Free(&enc[i]);
-    }
-}
-#endif /* !NO_RC4 */
-
-
-#ifdef HAVE_HC128
-void bench_hc128(void)
-{
-    HC128  enc;
-    double start;
-    int    i, count;
-
-    wc_Hc128_SetKey(&enc, bench_key, bench_iv);
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < numBlocks; i++) {
-            wc_Hc128_Process(&enc, bench_cipher, bench_plain, BENCH_SIZE);
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_sym_finish("HC128", 0, count, bench_size, start, 0);
-}
-#endif /* HAVE_HC128 */
-
-
-#ifndef NO_RABBIT
-void bench_rabbit(void)
-{
-    Rabbit enc;
-    double start;
-    int    i, count;
-
-    wc_RabbitSetKey(&enc, bench_key, bench_iv);
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < numBlocks; i++) {
-            wc_RabbitProcess(&enc, bench_cipher, bench_plain, BENCH_SIZE);
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_sym_finish("RABBIT", 0, count, bench_size, start, 0);
-}
-#endif /* NO_RABBIT */
-
-
-#ifdef HAVE_CHACHA
-void bench_chacha(void)
-{
-    ChaCha enc;
-    double start;
-    int    i, count;
-
-    wc_Chacha_SetKey(&enc, bench_key, 16);
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < numBlocks; i++) {
-            wc_Chacha_SetIV(&enc, bench_iv, 0);
-            wc_Chacha_Process(&enc, bench_cipher, bench_plain, BENCH_SIZE);
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_sym_finish("CHACHA", 0, count, bench_size, start, 0);
-}
-#endif /* HAVE_CHACHA*/
-
-#if defined(HAVE_CHACHA) && defined(HAVE_POLY1305)
-void bench_chacha20_poly1305_aead(void)
-{
-    double start;
-    int    ret = 0, i, count;
-
-    byte authTag[CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE];
-    XMEMSET(authTag, 0, sizeof(authTag));
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < numBlocks; i++) {
-            ret = wc_ChaCha20Poly1305_Encrypt(bench_key, bench_iv, NULL, 0,
-                bench_plain, BENCH_SIZE, bench_cipher, authTag);
-            if (ret < 0) {
-                printf("wc_ChaCha20Poly1305_Encrypt error: %d\n", ret);
-                break;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_sym_finish("CHA-POLY", 0, count, bench_size, start, ret);
-}
-#endif /* HAVE_CHACHA && HAVE_POLY1305 */
-
-
-#ifndef NO_MD5
-void bench_md5(int doAsync)
-{
-    wc_Md5 hash[BENCH_MAX_PENDING];
-    double start;
-    int    ret = 0, i, count = 0, times, pending = 0;
-    DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_MD5_DIGEST_SIZE, HEAP_HINT);
-
-    /* clear for done cleanup */
-    XMEMSET(hash, 0, sizeof(hash));
-
-    if (digest_stream) {
-        /* init keys */
-        for (i = 0; i < BENCH_MAX_PENDING; i++) {
-            ret = wc_InitMd5_ex(&hash[i], HEAP_HINT,
-                        doAsync ? devId : INVALID_DEVID);
-            if (ret != 0) {
-                printf("InitMd5_ex failed, ret = %d\n", ret);
-                goto exit;
-            }
-        #ifdef WOLFSSL_PIC32MZ_HASH
-            wc_Md5SizeSet(&hash[i], numBlocks * BENCH_SIZE);
-        #endif
-        }
-
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks || pending > 0; ) {
-                bench_async_poll(&pending);
-
-                /* while free pending slots in queue, submit ops */
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Md5Update(&hash[i], bench_plain,
-                            BENCH_SIZE);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_md5;
-                        }
-                    }
-                } /* for i */
-            } /* for times */
-            count += times;
-
-            times = 0;
-            do {
-                bench_async_poll(&pending);
-
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Md5Final(&hash[i], digest[i]);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_md5;
-                        }
-                    }
-                } /* for i */
-            } while (pending > 0);
-        } while (bench_stats_sym_check(start));
-    }
-    else {
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks; times++) {
-                ret = wc_InitMd5_ex(hash, HEAP_HINT, INVALID_DEVID);
-                ret |= wc_Md5Update(hash, bench_plain, BENCH_SIZE);
-                ret |= wc_Md5Final(hash, digest[0]);
-                if (ret != 0)
-                    goto exit_md5;
-            } /* for times */
-            count += times;
-        } while (bench_stats_sym_check(start));
-    }
-exit_md5:
-    bench_stats_sym_finish("MD5", doAsync, count, bench_size, start, ret);
-
-exit:
-
-#ifdef WOLFSSL_ASYNC_CRYPT
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_Md5Free(&hash[i]);
-    }
-#endif
-
-    FREE_ARRAY(digest, BENCH_MAX_PENDING, HEAP_HINT);
-}
-#endif /* !NO_MD5 */
-
-
-#ifndef NO_SHA
-void bench_sha(int doAsync)
-{
-    wc_Sha hash[BENCH_MAX_PENDING];
-    double start;
-    int    ret = 0, i, count = 0, times, pending = 0;
-    DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_SHA_DIGEST_SIZE, HEAP_HINT);
-
-    /* clear for done cleanup */
-    XMEMSET(hash, 0, sizeof(hash));
-
-    if (digest_stream) {
-        /* init keys */
-        for (i = 0; i < BENCH_MAX_PENDING; i++) {
-            ret = wc_InitSha_ex(&hash[i], HEAP_HINT,
-                doAsync ? devId : INVALID_DEVID);
-            if (ret != 0) {
-                printf("InitSha failed, ret = %d\n", ret);
-                goto exit;
-            }
-        #ifdef WOLFSSL_PIC32MZ_HASH
-            wc_ShaSizeSet(&hash[i], numBlocks * BENCH_SIZE);
-        #endif
-        }
-
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks || pending > 0; ) {
-                bench_async_poll(&pending);
-
-                /* while free pending slots in queue, submit ops */
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_ShaUpdate(&hash[i], bench_plain,
-                            BENCH_SIZE);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha;
-                        }
-                    }
-                } /* for i */
-            } /* for times */
-            count += times;
-
-            times = 0;
-            do {
-                bench_async_poll(&pending);
-
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_ShaFinal(&hash[i], digest[i]);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha;
-                        }
-                    }
-                } /* for i */
-            } while (pending > 0);
-        } while (bench_stats_sym_check(start));
-    }
-    else {
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks; times++) {
-                ret = wc_InitSha_ex(hash, HEAP_HINT, INVALID_DEVID);
-                ret |= wc_ShaUpdate(hash, bench_plain, BENCH_SIZE);
-                ret |= wc_ShaFinal(hash, digest[0]);
-                if (ret != 0)
-                    goto exit_sha;
-            } /* for times */
-            count += times;
-        } while (bench_stats_sym_check(start));
-    }
-exit_sha:
-    bench_stats_sym_finish("SHA", doAsync, count, bench_size, start, ret);
-
-exit:
-
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_ShaFree(&hash[i]);
-    }
-
-    FREE_ARRAY(digest, BENCH_MAX_PENDING, HEAP_HINT);
-}
-#endif /* NO_SHA */
-
-
-#ifdef WOLFSSL_SHA224
-void bench_sha224(int doAsync)
-{
-    wc_Sha224 hash[BENCH_MAX_PENDING];
-    double start;
-    int    ret = 0, i, count = 0, times, pending = 0;
-    DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_SHA224_DIGEST_SIZE, HEAP_HINT);
-
-    /* clear for done cleanup */
-    XMEMSET(hash, 0, sizeof(hash));
-
-    if (digest_stream) {
-        /* init keys */
-        for (i = 0; i < BENCH_MAX_PENDING; i++) {
-            ret = wc_InitSha224_ex(&hash[i], HEAP_HINT,
-                doAsync ? devId : INVALID_DEVID);
-            if (ret != 0) {
-                printf("InitSha224_ex failed, ret = %d\n", ret);
-                goto exit;
-            }
-        }
-
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks || pending > 0; ) {
-                bench_async_poll(&pending);
-
-                /* while free pending slots in queue, submit ops */
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Sha224Update(&hash[i], bench_plain,
-                            BENCH_SIZE);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha224;
-                        }
-                    }
-                } /* for i */
-            } /* for times */
-            count += times;
-
-            times = 0;
-            do {
-                bench_async_poll(&pending);
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Sha224Final(&hash[i], digest[i]);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha224;
-                        }
-                    }
-                } /* for i */
-            } while (pending > 0);
-        } while (bench_stats_sym_check(start));
-    }
-    else {
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks; times++) {
-                ret = wc_InitSha224_ex(hash, HEAP_HINT, INVALID_DEVID);
-                ret |= wc_Sha224Update(hash, bench_plain, BENCH_SIZE);
-                ret |= wc_Sha224Final(hash, digest[0]);
-                if (ret != 0)
-                    goto exit_sha224;
-            } /* for times */
-            count += times;
-        } while (bench_stats_sym_check(start));
-    }
-exit_sha224:
-    bench_stats_sym_finish("SHA-224", doAsync, count, bench_size, start, ret);
-
-exit:
-
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_Sha224Free(&hash[i]);
-    }
-
-    FREE_ARRAY(digest, BENCH_MAX_PENDING, HEAP_HINT);
-}
-#endif
-
-#ifndef NO_SHA256
-void bench_sha256(int doAsync)
-{
-    wc_Sha256 hash[BENCH_MAX_PENDING];
-    double start;
-    int    ret = 0, i, count = 0, times, pending = 0;
-    DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_SHA256_DIGEST_SIZE, HEAP_HINT);
-
-    /* clear for done cleanup */
-    XMEMSET(hash, 0, sizeof(hash));
-
-    if (digest_stream) {
-        /* init keys */
-        for (i = 0; i < BENCH_MAX_PENDING; i++) {
-            ret = wc_InitSha256_ex(&hash[i], HEAP_HINT,
-                doAsync ? devId : INVALID_DEVID);
-            if (ret != 0) {
-                printf("InitSha256_ex failed, ret = %d\n", ret);
-                goto exit;
-            }
-        #ifdef WOLFSSL_PIC32MZ_HASH
-            wc_Sha256SizeSet(&hash[i], numBlocks * BENCH_SIZE);
-        #endif
-        }
-
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks || pending > 0; ) {
-                bench_async_poll(&pending);
-
-                /* while free pending slots in queue, submit ops */
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Sha256Update(&hash[i], bench_plain,
-                            BENCH_SIZE);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha256;
-                        }
-                    }
-                } /* for i */
-            } /* for times */
-            count += times;
-
-            times = 0;
-            do {
-                bench_async_poll(&pending);
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Sha256Final(&hash[i], digest[i]);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha256;
-                        }
-                    }
-                } /* for i */
-            } while (pending > 0);
-        } while (bench_stats_sym_check(start));
-    }
-    else {
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks; times++) {
-                ret = wc_InitSha256_ex(hash, HEAP_HINT, INVALID_DEVID);
-                ret |= wc_Sha256Update(hash, bench_plain, BENCH_SIZE);
-                ret |= wc_Sha256Final(hash, digest[0]);
-                if (ret != 0)
-                    goto exit_sha256;
-            } /* for times */
-            count += times;
-        } while (bench_stats_sym_check(start));
-    }
-exit_sha256:
-    bench_stats_sym_finish("SHA-256", doAsync, count, bench_size, start, ret);
-
-exit:
-
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_Sha256Free(&hash[i]);
-    }
-
-    FREE_ARRAY(digest, BENCH_MAX_PENDING, HEAP_HINT);
-}
-#endif
-
-#ifdef WOLFSSL_SHA384
-void bench_sha384(int doAsync)
-{
-    wc_Sha384 hash[BENCH_MAX_PENDING];
-    double start;
-    int    ret = 0, i, count = 0, times, pending = 0;
-    DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_SHA384_DIGEST_SIZE, HEAP_HINT);
-
-    /* clear for done cleanup */
-    XMEMSET(hash, 0, sizeof(hash));
-
-    if (digest_stream) {
-        /* init keys */
-        for (i = 0; i < BENCH_MAX_PENDING; i++) {
-            ret = wc_InitSha384_ex(&hash[i], HEAP_HINT,
-                doAsync ? devId : INVALID_DEVID);
-            if (ret != 0) {
-                printf("InitSha384_ex failed, ret = %d\n", ret);
-                goto exit;
-            }
-        }
-
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks || pending > 0; ) {
-                bench_async_poll(&pending);
-
-                /* while free pending slots in queue, submit ops */
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Sha384Update(&hash[i], bench_plain,
-                            BENCH_SIZE);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha384;
-                        }
-                    }
-                } /* for i */
-            } /* for times */
-            count += times;
-
-            times = 0;
-            do {
-                bench_async_poll(&pending);
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Sha384Final(&hash[i], digest[i]);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha384;
-                        }
-                    }
-                } /* for i */
-            } while (pending > 0);
-        } while (bench_stats_sym_check(start));
-    }
-    else {
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks; times++) {
-                ret = wc_InitSha384_ex(hash, HEAP_HINT, INVALID_DEVID);
-                ret |= wc_Sha384Update(hash, bench_plain, BENCH_SIZE);
-                ret |= wc_Sha384Final(hash, digest[0]);
-                if (ret != 0)
-                    goto exit_sha384;
-            } /* for times */
-            count += times;
-        } while (bench_stats_sym_check(start));
-    }
-exit_sha384:
-    bench_stats_sym_finish("SHA-384", doAsync, count, bench_size, start, ret);
-
-exit:
-
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_Sha384Free(&hash[i]);
-    }
-
-    FREE_ARRAY(digest, BENCH_MAX_PENDING, HEAP_HINT);
-}
-#endif
-
-#ifdef WOLFSSL_SHA512
-void bench_sha512(int doAsync)
-{
-    wc_Sha512 hash[BENCH_MAX_PENDING];
-    double start;
-    int    ret = 0, i, count = 0, times, pending = 0;
-    DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_SHA512_DIGEST_SIZE, HEAP_HINT);
-
-    /* clear for done cleanup */
-    XMEMSET(hash, 0, sizeof(hash));
-
-    if (digest_stream) {
-        /* init keys */
-        for (i = 0; i < BENCH_MAX_PENDING; i++) {
-            ret = wc_InitSha512_ex(&hash[i], HEAP_HINT,
-                doAsync ? devId : INVALID_DEVID);
-            if (ret != 0) {
-                printf("InitSha512_ex failed, ret = %d\n", ret);
-                goto exit;
-            }
-        }
-
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks || pending > 0; ) {
-                bench_async_poll(&pending);
-
-                /* while free pending slots in queue, submit ops */
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Sha512Update(&hash[i], bench_plain,
-                            BENCH_SIZE);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha512;
-                        }
-                    }
-                } /* for i */
-            } /* for times */
-            count += times;
-
-            times = 0;
-            do {
-                bench_async_poll(&pending);
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Sha512Final(&hash[i], digest[i]);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha512;
-                        }
-                    }
-                } /* for i */
-            } while (pending > 0);
-        } while (bench_stats_sym_check(start));
-    }
-    else {
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks; times++) {
-                ret = wc_InitSha512_ex(hash, HEAP_HINT, INVALID_DEVID);
-                ret |= wc_Sha512Update(hash, bench_plain, BENCH_SIZE);
-                ret |= wc_Sha512Final(hash, digest[0]);
-                if (ret != 0)
-                    goto exit_sha512;
-            } /* for times */
-            count += times;
-        } while (bench_stats_sym_check(start));
-    }
-exit_sha512:
-    bench_stats_sym_finish("SHA-512", doAsync, count, bench_size, start, ret);
-
-exit:
-
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_Sha512Free(&hash[i]);
-    }
-
-    FREE_ARRAY(digest, BENCH_MAX_PENDING, HEAP_HINT);
-}
-#endif
-
-
-#ifdef WOLFSSL_SHA3
-#ifndef WOLFSSL_NOSHA3_224
-void bench_sha3_224(int doAsync)
-{
-    wc_Sha3   hash[BENCH_MAX_PENDING];
-    double start;
-    int    ret = 0, i, count = 0, times, pending = 0;
-    DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_SHA3_224_DIGEST_SIZE, HEAP_HINT);
-
-    /* clear for done cleanup */
-    XMEMSET(hash, 0, sizeof(hash));
-
-    if (digest_stream) {
-        /* init keys */
-        for (i = 0; i < BENCH_MAX_PENDING; i++) {
-            ret = wc_InitSha3_224(&hash[i], HEAP_HINT,
-                doAsync ? devId : INVALID_DEVID);
-            if (ret != 0) {
-                printf("InitSha3_224 failed, ret = %d\n", ret);
-                goto exit;
-            }
-        }
-
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks || pending > 0; ) {
-                bench_async_poll(&pending);
-
-                /* while free pending slots in queue, submit ops */
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Sha3_224_Update(&hash[i], bench_plain,
-                            BENCH_SIZE);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha3_224;
-                        }
-                    }
-                } /* for i */
-            } /* for times */
-            count += times;
-
-            times = 0;
-            do {
-                bench_async_poll(&pending);
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Sha3_224_Final(&hash[i], digest[i]);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha3_224;
-                        }
-                    }
-                } /* for i */
-            } while (pending > 0);
-        } while (bench_stats_sym_check(start));
-    }
-    else {
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks; times++) {
-                ret = wc_InitSha3_224(hash, HEAP_HINT, INVALID_DEVID);
-                ret |= wc_Sha3_224_Update(hash, bench_plain, BENCH_SIZE);
-                ret |= wc_Sha3_224_Final(hash, digest[0]);
-                if (ret != 0)
-                    goto exit_sha3_224;
-            } /* for times */
-            count += times;
-        } while (bench_stats_sym_check(start));
-    }
-exit_sha3_224:
-    bench_stats_sym_finish("SHA3-224", doAsync, count, bench_size, start, ret);
-
-exit:
-
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_Sha3_224_Free(&hash[i]);
-    }
-
-    FREE_ARRAY(digest, BENCH_MAX_PENDING, HEAP_HINT);
-}
-#endif /* WOLFSSL_NOSHA3_224 */
-
-#ifndef WOLFSSL_NOSHA3_256
-void bench_sha3_256(int doAsync)
-{
-    wc_Sha3   hash[BENCH_MAX_PENDING];
-    double start;
-    int    ret = 0, i, count = 0, times, pending = 0;
-    DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_SHA3_256_DIGEST_SIZE, HEAP_HINT);
-
-    /* clear for done cleanup */
-    XMEMSET(hash, 0, sizeof(hash));
-
-    if (digest_stream) {
-        /* init keys */
-        for (i = 0; i < BENCH_MAX_PENDING; i++) {
-            ret = wc_InitSha3_256(&hash[i], HEAP_HINT,
-                doAsync ? devId : INVALID_DEVID);
-            if (ret != 0) {
-                printf("InitSha3_256 failed, ret = %d\n", ret);
-                goto exit;
-            }
-        }
-
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks || pending > 0; ) {
-                bench_async_poll(&pending);
-
-                /* while free pending slots in queue, submit ops */
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Sha3_256_Update(&hash[i], bench_plain,
-                            BENCH_SIZE);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha3_256;
-                        }
-                    }
-                } /* for i */
-            } /* for times */
-            count += times;
-
-            times = 0;
-            do {
-                bench_async_poll(&pending);
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Sha3_256_Final(&hash[i], digest[i]);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha3_256;
-                        }
-                    }
-                } /* for i */
-            } while (pending > 0);
-        } while (bench_stats_sym_check(start));
-    }
-    else {
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks; times++) {
-                ret = wc_InitSha3_256(hash, HEAP_HINT, INVALID_DEVID);
-                ret |= wc_Sha3_256_Update(hash, bench_plain, BENCH_SIZE);
-                ret |= wc_Sha3_256_Final(hash, digest[0]);
-                if (ret != 0)
-                    goto exit_sha3_256;
-            } /* for times */
-            count += times;
-        } while (bench_stats_sym_check(start));
-    }
-exit_sha3_256:
-    bench_stats_sym_finish("SHA3-256", doAsync, count, bench_size, start, ret);
-
-exit:
-
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_Sha3_256_Free(&hash[i]);
-    }
-
-    FREE_ARRAY(digest, BENCH_MAX_PENDING, HEAP_HINT);
-}
-#endif /* WOLFSSL_NOSHA3_256 */
-
-#ifndef WOLFSSL_NOSHA3_384
-void bench_sha3_384(int doAsync)
-{
-    wc_Sha3   hash[BENCH_MAX_PENDING];
-    double start;
-    int    ret = 0, i, count = 0, times, pending = 0;
-    DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_SHA3_384_DIGEST_SIZE, HEAP_HINT);
-
-    /* clear for done cleanup */
-    XMEMSET(hash, 0, sizeof(hash));
-
-    if (digest_stream) {
-        /* init keys */
-        for (i = 0; i < BENCH_MAX_PENDING; i++) {
-            ret = wc_InitSha3_384(&hash[i], HEAP_HINT,
-                doAsync ? devId : INVALID_DEVID);
-            if (ret != 0) {
-                printf("InitSha3_384 failed, ret = %d\n", ret);
-                goto exit;
-            }
-        }
-
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks || pending > 0; ) {
-                bench_async_poll(&pending);
-
-                /* while free pending slots in queue, submit ops */
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Sha3_384_Update(&hash[i], bench_plain,
-                            BENCH_SIZE);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha3_384;
-                        }
-                    }
-                } /* for i */
-            } /* for times */
-            count += times;
-
-            times = 0;
-            do {
-                bench_async_poll(&pending);
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Sha3_384_Final(&hash[i], digest[i]);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha3_384;
-                        }
-                    }
-                } /* for i */
-            } while (pending > 0);
-        } while (bench_stats_sym_check(start));
-    }
-    else {
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks; times++) {
-                ret = wc_InitSha3_384(hash, HEAP_HINT, INVALID_DEVID);
-                ret |= wc_Sha3_384_Update(hash, bench_plain, BENCH_SIZE);
-                ret |= wc_Sha3_384_Final(hash, digest[0]);
-                if (ret != 0)
-                    goto exit_sha3_384;
-            } /* for times */
-            count += times;
-        } while (bench_stats_sym_check(start));
-    }
-exit_sha3_384:
-    bench_stats_sym_finish("SHA3-384", doAsync, count, bench_size, start, ret);
-
-exit:
-
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_Sha3_384_Free(&hash[i]);
-    }
-
-    FREE_ARRAY(digest, BENCH_MAX_PENDING, HEAP_HINT);
-}
-#endif /* WOLFSSL_NOSHA3_384 */
-
-#ifndef WOLFSSL_NOSHA3_512
-void bench_sha3_512(int doAsync)
-{
-    wc_Sha3   hash[BENCH_MAX_PENDING];
-    double start;
-    int    ret = 0, i, count = 0, times, pending = 0;
-    DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_SHA3_512_DIGEST_SIZE, HEAP_HINT);
-
-    /* clear for done cleanup */
-    XMEMSET(hash, 0, sizeof(hash));
-
-    if (digest_stream) {
-        /* init keys */
-        for (i = 0; i < BENCH_MAX_PENDING; i++) {
-            ret = wc_InitSha3_512(&hash[i], HEAP_HINT,
-                doAsync ? devId : INVALID_DEVID);
-            if (ret != 0) {
-                printf("InitSha3_512 failed, ret = %d\n", ret);
-                goto exit;
-            }
-        }
-
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks || pending > 0; ) {
-                bench_async_poll(&pending);
-
-                /* while free pending slots in queue, submit ops */
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Sha3_512_Update(&hash[i], bench_plain,
-                            BENCH_SIZE);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha3_512;
-                        }
-                    }
-                } /* for i */
-            } /* for times */
-            count += times;
-
-            times = 0;
-            do {
-                bench_async_poll(&pending);
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, numBlocks, &pending)) {
-                        ret = wc_Sha3_512_Final(&hash[i], digest[i]);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hash[i]), 0, &times, &pending)) {
-                            goto exit_sha3_512;
-                        }
-                    }
-                } /* for i */
-            } while (pending > 0);
-        } while (bench_stats_sym_check(start));
-    }
-    else {
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < numBlocks; times++) {
-                ret = wc_InitSha3_512(hash, HEAP_HINT, INVALID_DEVID);
-                ret |= wc_Sha3_512_Update(hash, bench_plain, BENCH_SIZE);
-                ret |= wc_Sha3_512_Final(hash, digest[0]);
-                if (ret != 0)
-                    goto exit_sha3_512;
-            } /* for times */
-            count += times;
-        } while (bench_stats_sym_check(start));
-    }
-exit_sha3_512:
-    bench_stats_sym_finish("SHA3-512", doAsync, count, bench_size, start, ret);
-
-exit:
-
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_Sha3_512_Free(&hash[i]);
-    }
-
-    FREE_ARRAY(digest, BENCH_MAX_PENDING, HEAP_HINT);
-}
-#endif /* WOLFSSL_NOSHA3_512 */
-#endif
-
-
-#ifdef WOLFSSL_RIPEMD
-int bench_ripemd(void)
-{
-    RipeMd hash;
-    byte   digest[RIPEMD_DIGEST_SIZE];
-    double start;
-    int    i, count, ret = 0;
-
-    if (digest_stream) {
-        ret = wc_InitRipeMd(&hash);
-        if (ret != 0) {
-            return ret;
-        }
-
-        bench_stats_start(&count, &start);
-        do {
-            for (i = 0; i < numBlocks; i++) {
-                ret = wc_RipeMdUpdate(&hash, bench_plain, BENCH_SIZE);
-                if (ret != 0) {
-                    return ret;
-                }
-            }
-            ret = wc_RipeMdFinal(&hash, digest);
-            if (ret != 0) {
-                return ret;
-            }
-
-            count += i;
-        } while (bench_stats_sym_check(start));
-    }
-    else {
-        bench_stats_start(&count, &start);
-        do {
-            for (i = 0; i < numBlocks; i++) {
-                ret = wc_InitRipeMd(&hash);
-                if (ret != 0) {
-                    return ret;
-                }
-                ret = wc_RipeMdUpdate(&hash, bench_plain, BENCH_SIZE);
-                if (ret != 0) {
-                    return ret;
-                }
-                ret = wc_RipeMdFinal(&hash, digest);
-                if (ret != 0) {
-                    return ret;
-                }
-            }
-            count += i;
-        } while (bench_stats_sym_check(start));
-    }
-    bench_stats_sym_finish("RIPEMD", 0, count, bench_size, start, ret);
-
-    return 0;
-}
-#endif
-
-
-#ifdef HAVE_BLAKE2
-void bench_blake2b(void)
-{
-    Blake2b b2b;
-    byte    digest[64];
-    double  start;
-    int     ret = 0, i, count;
-
-    if (digest_stream) {
-        ret = wc_InitBlake2b(&b2b, 64);
-        if (ret != 0) {
-            printf("InitBlake2b failed, ret = %d\n", ret);
-            return;
-        }
-
-        bench_stats_start(&count, &start);
-        do {
-            for (i = 0; i < numBlocks; i++) {
-                ret = wc_Blake2bUpdate(&b2b, bench_plain, BENCH_SIZE);
-                if (ret != 0) {
-                    printf("Blake2bUpdate failed, ret = %d\n", ret);
-                    return;
-                }
-            }
-            ret = wc_Blake2bFinal(&b2b, digest, 64);
-            if (ret != 0) {
-                printf("Blake2bFinal failed, ret = %d\n", ret);
-                return;
-            }
-            count += i;
-        } while (bench_stats_sym_check(start));
-    }
-    else {
-        bench_stats_start(&count, &start);
-        do {
-            for (i = 0; i < numBlocks; i++) {
-                ret = wc_InitBlake2b(&b2b, 64);
-                if (ret != 0) {
-                    printf("InitBlake2b failed, ret = %d\n", ret);
-                    return;
-                }
-                ret = wc_Blake2bUpdate(&b2b, bench_plain, BENCH_SIZE);
-                if (ret != 0) {
-                    printf("Blake2bUpdate failed, ret = %d\n", ret);
-                    return;
-                }
-                ret = wc_Blake2bFinal(&b2b, digest, 64);
-                if (ret != 0) {
-                    printf("Blake2bFinal failed, ret = %d\n", ret);
-                    return;
-                }
-            }
-            count += i;
-        } while (bench_stats_sym_check(start));
-    }
-    bench_stats_sym_finish("BLAKE2b", 0, count, bench_size, start, ret);
-}
-#endif
-
-#if defined(HAVE_BLAKE2S)
-void bench_blake2s(void)
-{
-    Blake2s b2s;
-    byte    digest[32];
-    double  start;
-    int     ret = 0, i, count;
-
-    if (digest_stream) {
-        ret = wc_InitBlake2s(&b2s, 32);
-        if (ret != 0) {
-            printf("InitBlake2s failed, ret = %d\n", ret);
-            return;
-        }
-
-        bench_stats_start(&count, &start);
-        do {
-            for (i = 0; i < numBlocks; i++) {
-                ret = wc_Blake2sUpdate(&b2s, bench_plain, BENCH_SIZE);
-                if (ret != 0) {
-                    printf("Blake2sUpdate failed, ret = %d\n", ret);
-                    return;
-                }
-            }
-            ret = wc_Blake2sFinal(&b2s, digest, 32);
-            if (ret != 0) {
-                printf("Blake2sFinal failed, ret = %d\n", ret);
-                return;
-            }
-            count += i;
-        } while (bench_stats_sym_check(start));
-    }
-    else {
-        bench_stats_start(&count, &start);
-        do {
-            for (i = 0; i < numBlocks; i++) {
-                ret = wc_InitBlake2s(&b2s, 32);
-                if (ret != 0) {
-                    printf("InitBlake2b failed, ret = %d\n", ret);
-                    return;
-                }
-                ret = wc_Blake2sUpdate(&b2s, bench_plain, BENCH_SIZE);
-                if (ret != 0) {
-                    printf("Blake2bUpdate failed, ret = %d\n", ret);
-                    return;
-                }
-                ret = wc_Blake2sFinal(&b2s, digest, 32);
-                if (ret != 0) {
-                    printf("Blake2sFinal failed, ret = %d\n", ret);
-                    return;
-                }
-            }
-            count += i;
-        } while (bench_stats_sym_check(start));
-    }
-    bench_stats_sym_finish("BLAKE2s", 0, count, bench_size, start, ret);
-}
-#endif
-
-
-#ifdef WOLFSSL_CMAC
-
-static void bench_cmac_helper(int keySz, const char* outMsg)
-{
-    Cmac    cmac;
-    byte    digest[AES_BLOCK_SIZE];
-    word32  digestSz = sizeof(digest);
-    double  start;
-    int     ret, i, count;
-
-    bench_stats_start(&count, &start);
-    do {
-        ret = wc_InitCmac(&cmac, bench_key, keySz, WC_CMAC_AES, NULL);
-        if (ret != 0) {
-            printf("InitCmac failed, ret = %d\n", ret);
-            return;
-        }
-
-        for (i = 0; i < numBlocks; i++) {
-            ret = wc_CmacUpdate(&cmac, bench_plain, BENCH_SIZE);
-            if (ret != 0) {
-                printf("CmacUpdate failed, ret = %d\n", ret);
-                return;
-            }
-        }
-        /* Note: final force zero's the Cmac struct */
-        ret = wc_CmacFinal(&cmac, digest, &digestSz);
-        if (ret != 0) {
-            printf("CmacFinal failed, ret = %d\n", ret);
-            return;
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_sym_finish(outMsg, 0, count, bench_size, start, ret);
-}
-
-void bench_cmac(void)
-{
-#ifdef WOLFSSL_AES_128
-    bench_cmac_helper(16, "AES-128-CMAC");
-#endif
-#ifdef WOLFSSL_AES_256
-    bench_cmac_helper(32, "AES-256-CMAC");
-#endif
-
-}
-#endif /* WOLFSSL_CMAC */
-
-#ifdef HAVE_SCRYPT
-
-void bench_scrypt(void)
-{
-    byte   derived[64];
-    double start;
-    int    ret, i, count;
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < scryptCnt; i++) {
-            ret = wc_scrypt(derived, (byte*)"pleaseletmein", 13,
-                            (byte*)"SodiumChloride", 14, 14, 8, 1, sizeof(derived));
-            if (ret != 0) {
-                printf("scrypt failed, ret = %d\n", ret);
-                goto exit;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-exit:
-    bench_stats_asym_finish("scrypt", 17, "", 0, count, start, ret);
-}
-
-#endif /* HAVE_SCRYPT */
-
-#ifndef NO_HMAC
-
-static void bench_hmac(int doAsync, int type, int digestSz,
-                       byte* key, word32 keySz, const char* label)
-{
-    Hmac   hmac[BENCH_MAX_PENDING];
-    double start;
-    int    ret = 0, i, count = 0, times, pending = 0;
-#ifdef WOLFSSL_ASYNC_CRYPT
-    DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, WC_MAX_DIGEST_SIZE, HEAP_HINT);
-#else
-	byte digest[BENCH_MAX_PENDING][WC_MAX_DIGEST_SIZE];
-#endif
-
-	(void)digestSz;
-
-    /* clear for done cleanup */
-    XMEMSET(hmac, 0, sizeof(hmac));
-
-    /* init keys */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        ret = wc_HmacInit(&hmac[i], HEAP_HINT,
-                doAsync ? devId : INVALID_DEVID);
-        if (ret != 0) {
-            printf("wc_HmacInit failed for %s, ret = %d\n", label, ret);
-            goto exit;
-        }
-
-        ret = wc_HmacSetKey(&hmac[i], type, key, keySz);
-        if (ret != 0) {
-            printf("wc_HmacSetKey failed for %s, ret = %d\n", label, ret);
-            goto exit;
-        }
-    }
-
-    bench_stats_start(&count, &start);
-    do {
-        for (times = 0; times < numBlocks || pending > 0; ) {
-            bench_async_poll(&pending);
-
-            /* while free pending slots in queue, submit ops */
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hmac[i]), 0,
-                                      &times, numBlocks, &pending)) {
-                    ret = wc_HmacUpdate(&hmac[i], bench_plain, BENCH_SIZE);
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hmac[i]),
-                                            0, &times, &pending)) {
-                        goto exit_hmac;
-                    }
-                }
-            } /* for i */
-        } /* for times */
-        count += times;
-
-        times = 0;
-        do {
-            bench_async_poll(&pending);
-
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&hmac[i]), 0,
-                                      &times, numBlocks, &pending)) {
-                    ret = wc_HmacFinal(&hmac[i], digest[i]);
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&hmac[i]),
-                                            0, &times, &pending)) {
-                        goto exit_hmac;
-                    }
-                }
-            } /* for i */
-        } while (pending > 0);
-    } while (bench_stats_sym_check(start));
-exit_hmac:
-    bench_stats_sym_finish(label, doAsync, count, bench_size, start, ret);
-
-exit:
-
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_HmacFree(&hmac[i]);
-    }
-
-#ifdef WOLFSSL_ASYNC_CRYPT
-    FREE_ARRAY(digest, BENCH_MAX_PENDING, HEAP_HINT);
-#endif
-}
-
-#ifndef NO_MD5
-
-void bench_hmac_md5(int doAsync)
-{
-    byte key[] = { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b };
-
-    bench_hmac(doAsync, WC_MD5, WC_MD5_DIGEST_SIZE, key, sizeof(key),
-               "HMAC-MD5");
-}
-
-#endif /* NO_MD5 */
-
-#ifndef NO_SHA
-
-void bench_hmac_sha(int doAsync)
-{
-    byte key[] = { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b };
-
-    bench_hmac(doAsync, WC_SHA, WC_SHA_DIGEST_SIZE, key, sizeof(key),
-               "HMAC-SHA");
-}
-
-#endif /* NO_SHA */
-
-#ifdef WOLFSSL_SHA224
-
-void bench_hmac_sha224(int doAsync)
-{
-    byte key[] = { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b };
-
-    bench_hmac(doAsync, WC_SHA224, WC_SHA224_DIGEST_SIZE, key, sizeof(key),
-               "HMAC-SHA224");
-}
-
-#endif /* WOLFSSL_SHA224 */
-
-#ifndef NO_SHA256
-
-void bench_hmac_sha256(int doAsync)
-{
-    byte key[] = { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b };
-
-    bench_hmac(doAsync, WC_SHA256, WC_SHA256_DIGEST_SIZE, key, sizeof(key),
-               "HMAC-SHA256");
-}
-
-#endif /* NO_SHA256 */
-
-#ifdef WOLFSSL_SHA384
-
-void bench_hmac_sha384(int doAsync)
-{
-    byte key[] = { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b };
-
-    bench_hmac(doAsync, WC_SHA384, WC_SHA384_DIGEST_SIZE, key, sizeof(key),
-               "HMAC-SHA384");
-}
-
-#endif /* WOLFSSL_SHA384 */
-
-#ifdef WOLFSSL_SHA512
-
-void bench_hmac_sha512(int doAsync)
-{
-    byte key[] = { 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-                   0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b };
-
-    bench_hmac(doAsync, WC_SHA512, WC_SHA512_DIGEST_SIZE, key, sizeof(key),
-               "HMAC-SHA512");
-}
-
-#endif /* WOLFSSL_SHA512 */
-
-#ifndef NO_PWDBASED
-void bench_pbkdf2(void)
-{
-    double start;
-    int    ret = 0, count = 0;
-    const char* passwd32 = "passwordpasswordpasswordpassword";
-    const byte salt32[] = { 0x78, 0x57, 0x8E, 0x5a, 0x5d, 0x63, 0xcb, 0x06,
-                            0x78, 0x57, 0x8E, 0x5a, 0x5d, 0x63, 0xcb, 0x06,
-                            0x78, 0x57, 0x8E, 0x5a, 0x5d, 0x63, 0xcb, 0x06,
-                            0x78, 0x57, 0x8E, 0x5a, 0x5d, 0x63, 0xcb, 0x06 };
-    byte derived[32];
-
-    bench_stats_start(&count, &start);
-    do {
-        ret = wc_PBKDF2(derived, (const byte*)passwd32, (int)XSTRLEN(passwd32),
-            salt32, (int)sizeof(salt32), 1000, 32, WC_SHA256);
-        count++;
-    } while (bench_stats_sym_check(start));
-    bench_stats_sym_finish("PBKDF2", 32, count, 32, start, ret);
-}
-#endif /* !NO_PWDBASED */
-
-#endif /* NO_HMAC */
-
-#ifndef NO_RSA
-
-#if defined(WOLFSSL_KEY_GEN)
-static void bench_rsaKeyGen_helper(int doAsync, int keySz)
-{
-    RsaKey genKey[BENCH_MAX_PENDING];
-    double start;
-    int    ret = 0, i, count = 0, times, pending = 0;
-    const long rsa_e_val = WC_RSA_EXPONENT;
-    const char**desc = bench_desc_words[lng_index];
-
-    /* clear for done cleanup */
-    XMEMSET(genKey, 0, sizeof(genKey));
-
-    bench_stats_start(&count, &start);
-    do {
-        /* while free pending slots in queue, submit ops */
-        for (times = 0; times < genTimes || pending > 0; ) {
-            bench_async_poll(&pending);
-
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&genKey[i]), 0, &times, genTimes, &pending)) {
-
-                    wc_FreeRsaKey(&genKey[i]);
-                    ret = wc_InitRsaKey_ex(&genKey[i], HEAP_HINT,
-                        doAsync ? devId : INVALID_DEVID);
-                    if (ret < 0) {
-                        goto exit;
-                    }
-
-                    ret = wc_MakeRsaKey(&genKey[i], keySz, rsa_e_val, &gRng);
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&genKey[i]), 0, &times, &pending)) {
-                        goto exit;
-                    }
-                }
-            } /* for i */
-        } /* for times */
-        count += times;
-    } while (bench_stats_sym_check(start));
-exit:
-    bench_stats_asym_finish("RSA", keySz, desc[2], doAsync, count, start, ret);
-
-    /* cleanup */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_FreeRsaKey(&genKey[i]);
-    }
-}
-
-void bench_rsaKeyGen(int doAsync)
-{
-    int    k, keySz;
-#ifndef WOLFSSL_SP_MATH
-    const int  keySizes[2] = {1024, 2048};
-#else
-    const int  keySizes[1] = {2048};
-#endif
-
-    for (k = 0; k < (int)(sizeof(keySizes)/sizeof(int)); k++) {
-        keySz = keySizes[k];
-        bench_rsaKeyGen_helper(doAsync, keySz);
-    }
-}
-
-
-void bench_rsaKeyGen_size(int doAsync, int keySz)
-{
-    bench_rsaKeyGen_helper(doAsync, keySz);
-}
-#endif /* WOLFSSL_KEY_GEN */
-
-#if !defined(USE_CERT_BUFFERS_1024) && !defined(USE_CERT_BUFFERS_2048) && \
-    !defined(USE_CERT_BUFFERS_3072)
-    #if defined(WOLFSSL_MDK_SHELL)
-        static char *certRSAname = "certs/rsa2048.der";
-        /* set by shell command */
-        static void set_Bench_RSA_File(char * cert) { certRSAname = cert ; }
-    #elif defined(FREESCALE_MQX)
-        static char *certRSAname = "a:\\certs\\rsa2048.der";
-    #else
-        static const char *certRSAname = "certs/rsa2048.der";
-    #endif
-#endif
-
-#define RSA_BUF_SIZE 384  /* for up to 3072 bit */
-
-#if !defined(WOLFSSL_RSA_VERIFY_INLINE) && !defined(WOLFSSL_RSA_PUBLIC_ONLY)
-#elif defined(WOLFSSL_PUBLIC_MP) || !defined(WOLFSSL_RSA_PUBLIC_ONLY)
-    #if defined(USE_CERT_BUFFERS_2048)
-static unsigned char rsa_2048_sig[] = {
-    0x8c, 0x9e, 0x37, 0xbf, 0xc3, 0xa6, 0xba, 0x1c,
-    0x53, 0x22, 0x40, 0x4b, 0x8b, 0x0d, 0x3c, 0x0e,
-    0x2e, 0x8c, 0x31, 0x2c, 0x47, 0xbf, 0x03, 0x48,
-    0x18, 0x46, 0x73, 0x8d, 0xd7, 0xdd, 0x17, 0x64,
-    0x0d, 0x7f, 0xdc, 0x74, 0xed, 0x80, 0xc3, 0xe8,
-    0x9a, 0x18, 0x33, 0xd4, 0xe6, 0xc5, 0xe1, 0x54,
-    0x75, 0xd1, 0xbb, 0x40, 0xde, 0xa8, 0xb9, 0x1b,
-    0x14, 0xe8, 0xc1, 0x39, 0xeb, 0xa0, 0x69, 0x8a,
-    0xc6, 0x9b, 0xef, 0x53, 0xb5, 0x23, 0x2b, 0x78,
-    0x06, 0x43, 0x37, 0x11, 0x81, 0x84, 0x73, 0x33,
-    0x33, 0xfe, 0xf7, 0x5d, 0x2b, 0x84, 0xd6, 0x83,
-    0xd6, 0xdd, 0x55, 0x33, 0xef, 0xd1, 0xf7, 0x12,
-    0xb0, 0xc2, 0x0e, 0xb1, 0x78, 0xd4, 0xa8, 0xa3,
-    0x25, 0xeb, 0xed, 0x9a, 0xb3, 0xee, 0xc3, 0x7e,
-    0xce, 0x13, 0x18, 0x86, 0x31, 0xe1, 0xef, 0x01,
-    0x0f, 0x6e, 0x67, 0x24, 0x74, 0xbd, 0x0b, 0x7f,
-    0xa9, 0xca, 0x6f, 0xaa, 0x83, 0x28, 0x90, 0x40,
-    0xf1, 0xb5, 0x10, 0x0e, 0x26, 0x03, 0x05, 0x5d,
-    0x87, 0xb4, 0xe0, 0x4c, 0x98, 0xd8, 0xc6, 0x42,
-    0x89, 0x77, 0xeb, 0xb6, 0xd4, 0xe6, 0x26, 0xf3,
-    0x31, 0x25, 0xde, 0x28, 0x38, 0x58, 0xe8, 0x2c,
-    0xf4, 0x56, 0x7c, 0xb6, 0xfd, 0x99, 0xb0, 0xb0,
-    0xf4, 0x83, 0xb6, 0x74, 0xa9, 0x5b, 0x9f, 0xe8,
-    0xe9, 0xf1, 0xa1, 0x2a, 0xbd, 0xf6, 0x83, 0x28,
-    0x09, 0xda, 0xa6, 0xd6, 0xcd, 0x61, 0x60, 0xf7,
-    0x13, 0x4e, 0x46, 0x57, 0x38, 0x1e, 0x11, 0x92,
-    0x6b, 0x6b, 0xcf, 0xd3, 0xf4, 0x8b, 0x66, 0x03,
-    0x25, 0xa3, 0x7a, 0x2f, 0xce, 0xc1, 0x85, 0xa5,
-    0x48, 0x91, 0x8a, 0xb3, 0x4f, 0x5d, 0x98, 0xb1,
-    0x69, 0x58, 0x47, 0x69, 0x0c, 0x52, 0xdc, 0x42,
-    0x4c, 0xef, 0xe8, 0xd4, 0x4d, 0x6a, 0x33, 0x7d,
-    0x9e, 0xd2, 0x51, 0xe6, 0x41, 0xbf, 0x4f, 0xa2
-};
-    #elif defined(USE_CERT_BUFFERS_3072)
-static unsigned char rsa_3072_sig[] = {
-    0x1a, 0xd6, 0x0d, 0xfd, 0xe3, 0x41, 0x95, 0x76,
-    0x27, 0x16, 0x7d, 0xc7, 0x94, 0x16, 0xca, 0xa8,
-    0x26, 0x08, 0xbe, 0x78, 0x87, 0x72, 0x4c, 0xd9,
-    0xa7, 0xfc, 0x33, 0x77, 0x2d, 0x53, 0x07, 0xb5,
-    0x8c, 0xce, 0x48, 0x17, 0x9b, 0xff, 0x9f, 0x9b,
-    0x17, 0xc4, 0xbb, 0x72, 0xed, 0xdb, 0xa0, 0x34,
-    0x69, 0x5b, 0xc7, 0x4e, 0xbf, 0xec, 0x13, 0xc5,
-    0x98, 0x71, 0x9a, 0x4e, 0x18, 0x0e, 0xcb, 0xe7,
-    0xc6, 0xd5, 0x21, 0x31, 0x7c, 0x0d, 0xae, 0x14,
-    0x2b, 0x87, 0x4f, 0x77, 0x95, 0x2e, 0x26, 0xe2,
-    0x83, 0xfe, 0x49, 0x1e, 0x87, 0x19, 0x4a, 0x63,
-    0x73, 0x75, 0xf1, 0xf5, 0x71, 0xd2, 0xce, 0xd4,
-    0x39, 0x2b, 0xd9, 0xe0, 0x76, 0x70, 0xc8, 0xf8,
-    0xed, 0xdf, 0x90, 0x57, 0x17, 0xb9, 0x16, 0xf6,
-    0xe9, 0x49, 0x48, 0xce, 0x5a, 0x8b, 0xe4, 0x84,
-    0x7c, 0xf3, 0x31, 0x68, 0x97, 0x45, 0x68, 0x38,
-    0x50, 0x3a, 0x70, 0xbd, 0xb3, 0xd3, 0xd2, 0xe0,
-    0x56, 0x5b, 0xc2, 0x0c, 0x2c, 0x10, 0x70, 0x7b,
-    0xd4, 0x99, 0xf9, 0x38, 0x31, 0xb1, 0x86, 0xa0,
-    0x07, 0xf1, 0xf6, 0x53, 0xb0, 0x44, 0x82, 0x40,
-    0xd2, 0xab, 0x0e, 0x71, 0x5d, 0xe1, 0xea, 0x3a,
-    0x77, 0xc9, 0xef, 0xfe, 0x54, 0x65, 0xa3, 0x49,
-    0xfd, 0xa5, 0x33, 0xaa, 0x16, 0x1a, 0x38, 0xe7,
-    0xaa, 0xb7, 0x13, 0xb2, 0x3b, 0xc7, 0x00, 0x87,
-    0x12, 0xfe, 0xfd, 0xf4, 0x55, 0x6d, 0x1d, 0x4a,
-    0x0e, 0xad, 0xd0, 0x4c, 0x55, 0x91, 0x60, 0xd9,
-    0xef, 0x74, 0x69, 0x22, 0x8c, 0x51, 0x65, 0xc2,
-    0x04, 0xac, 0xd3, 0x8d, 0xf7, 0x35, 0x29, 0x13,
-    0x6d, 0x61, 0x7c, 0x39, 0x2f, 0x41, 0x4c, 0xdf,
-    0x38, 0xfd, 0x1a, 0x7d, 0x42, 0xa7, 0x6f, 0x3f,
-    0x3d, 0x9b, 0xd1, 0x97, 0xab, 0xc0, 0xa7, 0x28,
-    0x1c, 0xc0, 0x02, 0x26, 0xeb, 0xce, 0xf9, 0xe1,
-    0x34, 0x45, 0xaf, 0xbf, 0x8d, 0xb8, 0xe0, 0xff,
-    0xd9, 0x6f, 0x77, 0xf3, 0xf7, 0xed, 0x6a, 0xbb,
-    0x03, 0x52, 0xfb, 0x38, 0xfc, 0xea, 0x9f, 0xc9,
-    0x98, 0xed, 0x21, 0x45, 0xaf, 0x43, 0x2b, 0x64,
-    0x96, 0x82, 0x30, 0xe9, 0xb4, 0x36, 0x89, 0x77,
-    0x07, 0x4a, 0xc6, 0x1f, 0x38, 0x7a, 0xee, 0xb6,
-    0x86, 0xf6, 0x2f, 0x03, 0xec, 0xa2, 0xe5, 0x48,
-    0xe5, 0x5a, 0xf5, 0x1c, 0xd2, 0xd9, 0xd8, 0x2d,
-    0x9d, 0x06, 0x07, 0xc9, 0x8b, 0x5d, 0xe0, 0x0f,
-    0x5e, 0x0c, 0x53, 0x27, 0xff, 0x23, 0xee, 0xca,
-    0x5e, 0x4d, 0xf1, 0x95, 0x77, 0x78, 0x1f, 0xf2,
-    0x44, 0x5b, 0x7d, 0x01, 0x49, 0x61, 0x6f, 0x6d,
-    0xbf, 0xf5, 0x19, 0x06, 0x39, 0xe9, 0xe9, 0x29,
-    0xde, 0x47, 0x5e, 0x2e, 0x1f, 0x68, 0xf4, 0x32,
-    0x5e, 0xe9, 0xd0, 0xa7, 0xb4, 0x2a, 0x45, 0xdf,
-    0x15, 0x7d, 0x0d, 0x5b, 0xef, 0xc6, 0x23, 0xac
-};
-    #else
-        #error Not Supported Yet!
-    #endif
-#endif
-
-#if !defined(WOLFSSL_RSA_PUBLIC_ONLY) || defined(WOLFSSL_PUBLIC_MP)
-static void bench_rsa_helper(int doAsync, RsaKey rsaKey[BENCH_MAX_PENDING],
-        int rsaKeySz)
-{
-    int         ret = 0, i, times, count = 0, pending = 0;
-    word32      idx = 0;
-#ifndef WOLFSSL_RSA_VERIFY_ONLY
-    const char* messageStr = "Everyone gets Friday off.";
-    const int   len = (int)XSTRLEN((char*)messageStr);
-#endif
-    double      start = 0.0f;
-    const char**desc = bench_desc_words[lng_index];
-#ifndef WOLFSSL_RSA_VERIFY_ONLY
-    DECLARE_VAR_INIT(message, byte, len, messageStr, HEAP_HINT);
-#endif
-    #if !defined(WOLFSSL_MDK5_COMPLv5)
-    /* MDK5 compiler regard this as a executable statement, and does not allow declarations after the line. */
-    DECLARE_ARRAY_DYNAMIC_DEC(enc, byte, BENCH_MAX_PENDING, rsaKeySz, HEAP_HINT);
-    #else
-        byte* enc[BENCH_MAX_PENDING];
-    #endif
-    #if !defined(WOLFSSL_RSA_VERIFY_INLINE) && \
-                    !defined(WOLFSSL_RSA_PUBLIC_ONLY)
-        #if !defined(WOLFSSL_MDK5_COMPLv5)
-          /* MDK5 compiler regard this as a executable statement, and does not allow declarations after the line. */
-            DECLARE_ARRAY_DYNAMIC_DEC(out, byte, BENCH_MAX_PENDING, rsaKeySz, HEAP_HINT);
-            #else
-                int idxout;
-              byte* out[BENCH_MAX_PENDING];
-        #endif
-    #else
-        byte* out[BENCH_MAX_PENDING];
-    #endif
-
-    DECLARE_ARRAY_DYNAMIC_EXE(enc, byte, BENCH_MAX_PENDING, rsaKeySz, HEAP_HINT);
-    #if !defined(WOLFSSL_RSA_VERIFY_INLINE) && \
-                    !defined(WOLFSSL_RSA_PUBLIC_ONLY)
-        DECLARE_ARRAY_DYNAMIC_EXE(out, byte, BENCH_MAX_PENDING, rsaKeySz, HEAP_HINT);
-    #endif
-
-    if (!rsa_sign_verify) {
-#ifndef WOLFSSL_RSA_VERIFY_ONLY
-        /* begin public RSA */
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < ntimes || pending > 0; ) {
-                bench_async_poll(&pending);
-
-                /* while free pending slots in queue, submit ops */
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&rsaKey[i]),
-                                                 1, &times, ntimes, &pending)) {
-                        ret = wc_RsaPublicEncrypt(message, (word32)len, enc[i],
-                                                  rsaKeySz/8, &rsaKey[i],
-                                                  &gRng);
-                        if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(
-                                            &rsaKey[i]), 1, &times, &pending)) {
-                            goto exit_rsa_pub;
-                        }
-                    }
-                } /* for i */
-            } /* for times */
-            count += times;
-        } while (bench_stats_sym_check(start));
-exit_rsa_pub:
-        bench_stats_asym_finish("RSA", rsaKeySz, desc[0], doAsync, count,
-                                                                    start, ret);
-#endif
-
-#ifndef WOLFSSL_RSA_PUBLIC_ONLY
-        if (ret < 0) {
-            goto exit;
-        }
-
-        /* capture resulting encrypt length */
-        idx = (word32)(rsaKeySz/8);
-
-        /* begin private async RSA */
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < ntimes || pending > 0; ) {
-                bench_async_poll(&pending);
-
-                /* while free pending slots in queue, submit ops */
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&rsaKey[i]),
-                                                 1, &times, ntimes, &pending)) {
-                        ret = wc_RsaPrivateDecrypt(enc[i], idx, out[i],
-                                                       rsaKeySz/8, &rsaKey[i]);
-                        if (!bench_async_handle(&ret,
-                                                BENCH_ASYNC_GET_DEV(&rsaKey[i]),
-                                                1, &times, &pending)) {
-                            goto exit;
-                        }
-                    }
-                } /* for i */
-            } /* for times */
-            count += times;
-        } while (bench_stats_sym_check(start));
-exit:
-        bench_stats_asym_finish("RSA", rsaKeySz, desc[1], doAsync, count,
-                                                                    start, ret);
-#endif
-    }
-    else {
-#ifndef WOLFSSL_RSA_PUBLIC_ONLY
-        /* begin RSA sign */
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < ntimes || pending > 0; ) {
-                bench_async_poll(&pending);
-
-                /* while free pending slots in queue, submit ops */
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&rsaKey[i]),
-                                                 1, &times, ntimes, &pending)) {
-                        ret = wc_RsaSSL_Sign(message, len, enc[i],
-                                                rsaKeySz/8, &rsaKey[i], &gRng);
-                        if (!bench_async_handle(&ret,
-                                                BENCH_ASYNC_GET_DEV(&rsaKey[i]),
-                                                1, &times, &pending)) {
-                            goto exit_rsa_sign;
-                        }
-                    }
-                } /* for i */
-            } /* for times */
-            count += times;
-        } while (bench_stats_sym_check(start));
-exit_rsa_sign:
-        bench_stats_asym_finish("RSA", rsaKeySz, desc[4], doAsync, count, start,
-                                                                           ret);
-
-        if (ret < 0) {
-            goto exit;
-        }
-#endif
-
-        /* capture resulting encrypt length */
-        idx = rsaKeySz/8;
-
-        /* begin RSA verify */
-        bench_stats_start(&count, &start);
-        do {
-            for (times = 0; times < ntimes || pending > 0; ) {
-                bench_async_poll(&pending);
-
-                /* while free pending slots in queue, submit ops */
-                for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                    if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&rsaKey[i]),
-                                                 1, &times, ntimes, &pending)) {
-                    #if !defined(WOLFSSL_RSA_VERIFY_INLINE) && \
-                        !defined(WOLFSSL_RSA_PUBLIC_ONLY)
-                        ret = wc_RsaSSL_Verify(enc[i], idx, out[i],
-                                                      rsaKeySz/8, &rsaKey[i]);
-                    #elif defined(USE_CERT_BUFFERS_2048)
-                        XMEMCPY(enc[i], rsa_2048_sig, sizeof(rsa_2048_sig));
-                        idx = sizeof(rsa_2048_sig);
-                        out[i] = NULL;
-                        ret = wc_RsaSSL_VerifyInline(enc[i], idx, &out[i],
-                                                                    &rsaKey[i]);
-                        if (ret > 0)
-                            ret = 0;
-                    #elif defined(USE_CERT_BUFFERS_3072)
-                        XMEMCPY(enc[i], rsa_3072_sig, sizeof(rsa_3072_sig));
-                        idx = sizeof(rsa_3072_sig);
-                        out[i] = NULL;
-                        ret = wc_RsaSSL_VerifyInline(enc[i], idx, &out[i],
-                                                                    &rsaKey[i]);
-                        if (ret > 0)
-                            ret = 0;
-                    #endif
-                        if (!bench_async_handle(&ret,
-                                                BENCH_ASYNC_GET_DEV(&rsaKey[i]),
-                                                1, &times, &pending)) {
-                            goto exit_rsa_verify;
-                        }
-                    }
-                } /* for i */
-            } /* for times */
-            count += times;
-        } while (bench_stats_sym_check(start));
-exit_rsa_verify:
-        bench_stats_asym_finish("RSA", rsaKeySz, desc[5], doAsync, count,
-                                                                    start, ret);
-    }
-
-    FREE_ARRAY_DYNAMIC(enc, BENCH_MAX_PENDING, HEAP_HINT);
-#if !defined(WOLFSSL_RSA_VERIFY_INLINE) && !defined(WOLFSSL_RSA_PUBLIC_ONLY)
-    FREE_ARRAY_DYNAMIC(out, BENCH_MAX_PENDING, HEAP_HINT);
-#endif
-    FREE_VAR(message, HEAP_HINT);
-}
-#endif
-
-void bench_rsa(int doAsync)
-{
-    int         ret = 0, i;
-    RsaKey      rsaKey[BENCH_MAX_PENDING];
-#if !defined(WOLFSSL_RSA_PUBLIC_ONLY) || defined(WOLFSSL_PUBLIC_MP)
-    int         rsaKeySz; /* used in printf */
-    size_t      bytes;
-    const byte* tmp;
-    word32      idx;
-
-#ifdef USE_CERT_BUFFERS_1024
-    tmp = rsa_key_der_1024;
-    bytes = (size_t)sizeof_rsa_key_der_1024;
-    rsaKeySz = 1024;
-#elif defined(USE_CERT_BUFFERS_2048)
-    tmp = rsa_key_der_2048;
-    bytes = (size_t)sizeof_rsa_key_der_2048;
-    rsaKeySz = 2048;
-#elif defined(USE_CERT_BUFFERS_3072)
-    tmp = rsa_key_der_3072;
-    bytes = (size_t)sizeof_rsa_key_der_3072;
-    rsaKeySz = 3072;
-#else
-    #error "need a cert buffer size"
-#endif /* USE_CERT_BUFFERS */
-#endif
-
-    /* clear for done cleanup */
-    XMEMSET(rsaKey, 0, sizeof(rsaKey));
-
-    /* init keys */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        /* setup an async context for each key */
-        if ((ret = wc_InitRsaKey_ex(&rsaKey[i], HEAP_HINT,
-                                        doAsync ? devId : INVALID_DEVID)) < 0) {
-            goto exit_bench_rsa;
-        }
-
-#ifndef WOLFSSL_RSA_VERIFY_ONLY
-    #ifdef WC_RSA_BLINDING
-        ret = wc_RsaSetRNG(&rsaKey[i], &gRng);
-        if (ret != 0)
-            goto exit_bench_rsa;
-    #endif
-#endif
-
-#ifndef WOLFSSL_RSA_PUBLIC_ONLY
-        /* decode the private key */
-        idx = 0;
-        if ((ret = wc_RsaPrivateKeyDecode(tmp, &idx, &rsaKey[i],
-                                                        (word32)bytes)) != 0) {
-            printf("wc_RsaPrivateKeyDecode failed! %d\n", ret);
-            goto exit_bench_rsa;
-        }
-#elif defined(WOLFSSL_PUBLIC_MP)
-    #ifdef USE_CERT_BUFFERS_2048
-        ret = mp_read_unsigned_bin(&rsaKey[i].n, &tmp[12], 256);
-        if (ret != 0) {
-            printf("wc_RsaPrivateKeyDecode failed! %d\n", ret);
-            goto exit_bench_rsa;
-        }
-        ret = mp_set_int(&rsaKey[i].e, WC_RSA_EXPONENT);
-        if (ret != 0) {
-            printf("wc_RsaPrivateKeyDecode failed! %d\n", ret);
-            goto exit_bench_rsa;
-        }
-    #else
-        #error Not supported yet!
-    #endif
-        (void)idx;
-        (void)bytes;
-#endif
-
-    }
-
-#if !defined(WOLFSSL_RSA_PUBLIC_ONLY) || defined(WOLFSSL_PUBLIC_MP)
-    bench_rsa_helper(doAsync, rsaKey, rsaKeySz);
-#endif
-exit_bench_rsa:
-    /* cleanup */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_FreeRsaKey(&rsaKey[i]);
-    }
-}
-
-
-#ifdef WOLFSSL_KEY_GEN
-/* bench any size of RSA key */
-void bench_rsa_key(int doAsync, int rsaKeySz)
-{
-    int     ret = 0, i, pending = 0;
-    RsaKey  rsaKey[BENCH_MAX_PENDING];
-    int     isPending[BENCH_MAX_PENDING];
-    long    exp = 65537l;
-
-    /* clear for done cleanup */
-    XMEMSET(rsaKey, 0, sizeof(rsaKey));
-    XMEMSET(isPending, 0, sizeof(isPending));
-
-    /* init keys */
-    do {
-        pending = 0;
-        for (i = 0; i < BENCH_MAX_PENDING; i++) {
-            if (!isPending[i]) { /* if making the key is pending then just call
-                                  * wc_MakeRsaKey again */
-                /* setup an async context for each key */
-                if ((ret = wc_InitRsaKey_ex(&rsaKey[i], HEAP_HINT,
-                                    doAsync ? devId : INVALID_DEVID)) < 0) {
-                    goto exit_bench_rsa_key;
-                }
-
-            #ifdef WC_RSA_BLINDING
-                ret = wc_RsaSetRNG(&rsaKey[i], &gRng);
-                if (ret != 0)
-                    goto exit_bench_rsa_key;
-            #endif
-            }
-
-            /* create the RSA key */
-            ret = wc_MakeRsaKey(&rsaKey[i], rsaKeySz, exp, &gRng);
-            if (ret == WC_PENDING_E) {
-                isPending[i] = 1;
-                pending      = 1;
-            }
-            else if (ret != 0) {
-                printf("wc_MakeRsaKey failed! %d\n", ret);
-                goto exit_bench_rsa_key;
-            }
-        } /* for i */
-    } while (pending > 0);
-
-    bench_rsa_helper(doAsync, rsaKey, rsaKeySz);
-exit_bench_rsa_key:
-
-    /* cleanup */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_FreeRsaKey(&rsaKey[i]);
-    }
-}
-#endif /* WOLFSSL_KEY_GEN */
-#endif /* !NO_RSA */
-
-
-#ifndef NO_DH
-
-#if !defined(USE_CERT_BUFFERS_1024) && !defined(USE_CERT_BUFFERS_2048) && \
-    !defined(USE_CERT_BUFFERS_3072)
-    #if defined(WOLFSSL_MDK_SHELL)
-        static char *certDHname = "certs/dh2048.der";
-        /* set by shell command */
-        void set_Bench_DH_File(char * cert) { certDHname = cert ; }
-    #elif defined(FREESCALE_MQX)
-        static char *certDHname = "a:\\certs\\dh2048.der";
-    #elif defined(NO_ASN)
-        /* do nothing, but don't need a file */
-    #else
-        static const char *certDHname = "certs/dh2048.der";
-    #endif
-#endif
-
-#define BENCH_DH_KEY_SIZE  384 /* for 3072 bit */
-#define BENCH_DH_PRIV_SIZE (BENCH_DH_KEY_SIZE/8)
-
-void bench_dh(int doAsync)
-{
-    int    ret = 0, i;
-    int    count = 0, times, pending = 0;
-    const byte* tmp = NULL;
-    double start = 0.0f;
-    DhKey  dhKey[BENCH_MAX_PENDING];
-    int    dhKeySz = BENCH_DH_KEY_SIZE * 8; /* used in printf */
-    const char**desc = bench_desc_words[lng_index];
-#ifndef NO_ASN
-    size_t bytes = 0;
-    word32 idx;
-#endif
-    word32 pubSz[BENCH_MAX_PENDING];
-    word32 privSz[BENCH_MAX_PENDING];
-    word32 pubSz2;
-    word32 privSz2;
-    word32 agreeSz[BENCH_MAX_PENDING];
-#ifdef HAVE_FFDHE_2048
-    const DhParams *params = NULL;
-#endif
-
-    DECLARE_ARRAY(pub, byte, BENCH_MAX_PENDING, BENCH_DH_KEY_SIZE, HEAP_HINT);
-    DECLARE_VAR(pub2, byte, BENCH_DH_KEY_SIZE, HEAP_HINT);
-    DECLARE_ARRAY(agree, byte, BENCH_MAX_PENDING, BENCH_DH_KEY_SIZE, HEAP_HINT);
-    DECLARE_ARRAY(priv, byte, BENCH_MAX_PENDING, BENCH_DH_PRIV_SIZE, HEAP_HINT);
-    DECLARE_VAR(priv2, byte, BENCH_DH_PRIV_SIZE, HEAP_HINT);
-
-    (void)tmp;
-
-    if (!use_ffdhe) {
-#if defined(NO_ASN)
-        dhKeySz = 1024;
-        /* do nothing, but don't use default FILE */
-#elif defined(USE_CERT_BUFFERS_1024)
-        tmp = dh_key_der_1024;
-        bytes = (size_t)sizeof_dh_key_der_1024;
-        dhKeySz = 1024;
-#elif defined(USE_CERT_BUFFERS_2048)
-        tmp = dh_key_der_2048;
-        bytes = (size_t)sizeof_dh_key_der_2048;
-        dhKeySz = 2048;
-#elif defined(USE_CERT_BUFFERS_3072)
-        tmp = dh_key_der_3072;
-        bytes = (size_t)sizeof_dh_key_der_3072;
-        dhKeySz = 3072;
-#else
-    #error "need to define a cert buffer size"
-#endif /* USE_CERT_BUFFERS */
-    }
-#ifdef HAVE_FFDHE_2048
-    else if (use_ffdhe == 2048) {
-        params = wc_Dh_ffdhe2048_Get();
-        dhKeySz = 2048;
-    }
-#endif
-#ifdef HAVE_FFDHE_3072
-    else if (use_ffdhe == 3072) {
-        params = wc_Dh_ffdhe3072_Get();
-        dhKeySz = 3072;
-    }
-#endif
-
-    /* clear for done cleanup */
-    XMEMSET(dhKey, 0, sizeof(dhKey));
-
-    /* init keys */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        /* setup an async context for each key */
-        ret = wc_InitDhKey_ex(&dhKey[i], HEAP_HINT,
-                        doAsync ? devId : INVALID_DEVID);
-        if (ret != 0)
-            goto exit;
-
-        /* setup key */
-        if (!use_ffdhe) {
-    #ifdef NO_ASN
-            ret = wc_DhSetKey(&dhKey[i], dh_p, sizeof(dh_p), dh_g,
-                                                                  sizeof(dh_g));
-    #else
-            idx = 0;
-            ret = wc_DhKeyDecode(tmp, &idx, &dhKey[i], (word32)bytes);
-    #endif
-        }
-    #if defined(HAVE_FFDHE_2048) || defined(HAVE_FFDHE_3072)
-        else if (params != NULL) {
-            ret = wc_DhSetKey(&dhKey[i], params->p, params->p_len, params->g,
-                                                                 params->g_len);
-        }
-    #endif
-        if (ret != 0) {
-            printf("DhKeyDecode failed %d, can't benchmark\n", ret);
-            goto exit;
-        }
-    }
-
-    /* Key Gen */
-    bench_stats_start(&count, &start);
-    do {
-        /* while free pending slots in queue, submit ops */
-        for (times = 0; times < genTimes || pending > 0; ) {
-            bench_async_poll(&pending);
-
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&dhKey[i]), 0, &times, genTimes, &pending)) {
-                    privSz[i] = 0;
-                    ret = wc_DhGenerateKeyPair(&dhKey[i], &gRng, priv[i], &privSz[i],
-                        pub[i], &pubSz[i]);
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&dhKey[i]), 0, &times, &pending)) {
-                        goto exit_dh_gen;
-                    }
-                }
-            } /* for i */
-        } /* for times */
-        count += times;
-    } while (bench_stats_sym_check(start));
-exit_dh_gen:
-    bench_stats_asym_finish("DH", dhKeySz, desc[2], doAsync, count, start, ret);
-
-    if (ret < 0) {
-        goto exit;
-    }
-
-    /* Generate key to use as other public */
-    ret = wc_DhGenerateKeyPair(&dhKey[0], &gRng, priv2, &privSz2, pub2, &pubSz2);
-#ifdef WOLFSSL_ASYNC_CRYPT
-    ret = wc_AsyncWait(ret, &dhKey[0].asyncDev, WC_ASYNC_FLAG_NONE);
-#endif
-
-    /* Key Agree */
-    bench_stats_start(&count, &start);
-    do {
-        for (times = 0; times < agreeTimes || pending > 0; ) {
-            bench_async_poll(&pending);
-
-            /* while free pending slots in queue, submit ops */
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&dhKey[i]), 0, &times, agreeTimes, &pending)) {
-                    ret = wc_DhAgree(&dhKey[i], agree[i], &agreeSz[i], priv[i], privSz[i],
-                        pub2, pubSz2);
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&dhKey[i]), 0, &times, &pending)) {
-                        goto exit;
-                    }
-                }
-            } /* for i */
-        } /* for times */
-        count += times;
-    } while (bench_stats_sym_check(start));
-exit:
-    bench_stats_asym_finish("DH", dhKeySz, desc[3], doAsync, count, start, ret);
-
-    /* cleanup */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_FreeDhKey(&dhKey[i]);
-    }
-
-    FREE_ARRAY(pub, BENCH_MAX_PENDING, HEAP_HINT);
-    FREE_VAR(pub2, HEAP_HINT);
-    FREE_ARRAY(priv, BENCH_MAX_PENDING, HEAP_HINT);
-    FREE_VAR(priv2, HEAP_HINT);
-    FREE_ARRAY(agree, BENCH_MAX_PENDING, HEAP_HINT);
-}
-#endif /* !NO_DH */
-
-#ifdef HAVE_NTRU
-byte GetEntropy(ENTROPY_CMD cmd, byte* out);
-
-byte GetEntropy(ENTROPY_CMD cmd, byte* out)
-{
-    if (cmd == INIT)
-        return 1; /* using local rng */
-
-    if (out == NULL)
-        return 0;
-
-    if (cmd == GET_BYTE_OF_ENTROPY)
-        return (wc_RNG_GenerateBlock(&gRng, out, 1) == 0) ? 1 : 0;
-
-    if (cmd == GET_NUM_BYTES_PER_BYTE_OF_ENTROPY) {
-        *out = 1;
-        return 1;
-    }
-
-    return 0;
-}
-
-void bench_ntru(void)
-{
-    int    i;
-    double start;
-
-    byte   public_key[1027];
-    word16 public_key_len = sizeof(public_key);
-    byte   private_key[1120];
-    word16 private_key_len = sizeof(private_key);
-    word16 ntruBits = 128;
-    word16 type     = 0;
-    word32 ret;
-
-    byte ciphertext[1022];
-    word16 ciphertext_len;
-    byte plaintext[16];
-    word16 plaintext_len;
-    const char**desc = bench_desc_words[lng_index];
-
-    DRBG_HANDLE drbg;
-    static byte const aes_key[] = {
-        0xf3, 0xe9, 0x87, 0xbb, 0x18, 0x08, 0x3c, 0xaa,
-        0x7b, 0x12, 0x49, 0x88, 0xaf, 0xb3, 0x22, 0xd8
-    };
-
-    static byte const wolfsslStr[] = {
-        'w', 'o', 'l', 'f', 'S', 'S', 'L', ' ', 'N', 'T', 'R', 'U'
-    };
-
-    for (ntruBits = 128; ntruBits < 257; ntruBits += 64) {
-        switch (ntruBits) {
-            case 128:
-                type = NTRU_EES439EP1;
-                break;
-            case 192:
-                type = NTRU_EES593EP1;
-                break;
-            case 256:
-                type = NTRU_EES743EP1;
-                break;
-        }
-
-        ret = ntru_crypto_drbg_instantiate(ntruBits, wolfsslStr,
-                sizeof(wolfsslStr), (ENTROPY_FN) GetEntropy, &drbg);
-        if(ret != DRBG_OK) {
-            printf("NTRU drbg instantiate failed\n");
-            return;
-        }
-
-        /* set key sizes */
-        ret = ntru_crypto_ntru_encrypt_keygen(drbg, type, &public_key_len,
-                                                  NULL, &private_key_len, NULL);
-        if (ret != NTRU_OK) {
-            ntru_crypto_drbg_uninstantiate(drbg);
-            printf("NTRU failed to get key lengths\n");
-            return;
-        }
-
-        ret = ntru_crypto_ntru_encrypt_keygen(drbg, type, &public_key_len,
-                                     public_key, &private_key_len,
-                                     private_key);
-
-        ntru_crypto_drbg_uninstantiate(drbg);
-
-        if (ret != NTRU_OK) {
-            printf("NTRU keygen failed\n");
-            return;
-        }
-
-        ret = ntru_crypto_drbg_instantiate(ntruBits, NULL, 0,
-                (ENTROPY_FN)GetEntropy, &drbg);
-        if (ret != DRBG_OK) {
-            printf("NTRU error occurred during DRBG instantiation\n");
-            return;
-        }
-
-        ret = ntru_crypto_ntru_encrypt(drbg, public_key_len, public_key,
-                sizeof(aes_key), aes_key, &ciphertext_len, NULL);
-
-        if (ret != NTRU_OK) {
-            printf("NTRU error occurred requesting the buffer size needed\n");
-            return;
-        }
-
-        bench_stats_start(&i, &start);
-        for (i = 0; i < ntimes; i++) {
-            ret = ntru_crypto_ntru_encrypt(drbg, public_key_len, public_key,
-                    sizeof(aes_key), aes_key, &ciphertext_len, ciphertext);
-            if (ret != NTRU_OK) {
-                printf("NTRU encrypt error\n");
-                return;
-            }
-        }
-        bench_stats_asym_finish("NTRU", ntruBits, desc[6], 0, i, start, ret);
-
-        ret = ntru_crypto_drbg_uninstantiate(drbg);
-        if (ret != DRBG_OK) {
-            printf("NTRU error occurred uninstantiating the DRBG\n");
-            return;
-        }
-
-        ret = ntru_crypto_ntru_decrypt(private_key_len, private_key,
-                ciphertext_len, ciphertext, &plaintext_len, NULL);
-
-        if (ret != NTRU_OK) {
-            printf("NTRU decrypt error occurred getting the buffer size needed\n");
-            return;
-        }
-
-        plaintext_len = sizeof(plaintext);
-
-        bench_stats_start(&i, &start);
-        for (i = 0; i < ntimes; i++) {
-            ret = ntru_crypto_ntru_decrypt(private_key_len, private_key,
-                                      ciphertext_len, ciphertext,
-                                      &plaintext_len, plaintext);
-
-            if (ret != NTRU_OK) {
-                printf("NTRU error occurred decrypting the key\n");
-                return;
-            }
-        }
-        bench_stats_asym_finish("NTRU", ntruBits, desc[7], 0, i, start, ret);
-    }
-
-}
-
-void bench_ntruKeyGen(void)
-{
-    double start;
-    int    i;
-
-    byte   public_key[1027];
-    word16 public_key_len = sizeof(public_key);
-    byte   private_key[1120];
-    word16 private_key_len = sizeof(private_key);
-    word16 ntruBits = 128;
-    word16 type     = 0;
-    word32 ret;
-    const char**desc = bench_desc_words[lng_index];
-
-    DRBG_HANDLE drbg;
-    static uint8_t const pers_str[] = {
-                'w', 'o', 'l', 'f',  'S', 'S', 'L', ' ', 't', 'e', 's', 't'
-    };
-
-    for (ntruBits = 128; ntruBits < 257; ntruBits += 64) {
-        ret = ntru_crypto_drbg_instantiate(ntruBits, pers_str,
-                sizeof(pers_str), GetEntropy, &drbg);
-        if (ret != DRBG_OK) {
-            printf("NTRU drbg instantiate failed\n");
-            return;
-        }
-
-        switch (ntruBits) {
-            case 128:
-                type = NTRU_EES439EP1;
-                break;
-            case 192:
-                type = NTRU_EES593EP1;
-                break;
-            case 256:
-                type = NTRU_EES743EP1;
-                break;
-        }
-
-        /* set key sizes */
-        ret = ntru_crypto_ntru_encrypt_keygen(drbg, type, &public_key_len,
-                                                  NULL, &private_key_len, NULL);
-
-        bench_stats_start(&i, &start);
-        for (i = 0; i < genTimes; i++) {
-            ret = ntru_crypto_ntru_encrypt_keygen(drbg, type, &public_key_len,
-                                         public_key, &private_key_len,
-                                         private_key);
-        }
-        bench_stats_asym_finish("NTRU", ntruBits, desc[2], 0, i, start, ret);
-
-        if (ret != NTRU_OK) {
-            return;
-        }
-
-        ret = ntru_crypto_drbg_uninstantiate(drbg);
-
-        if (ret != NTRU_OK) {
-            printf("NTRU drbg uninstantiate failed\n");
-            return;
-        }
-    }
-}
-#endif
-
-#ifdef HAVE_ECC
-
-#ifndef BENCH_ECC_SIZE
-    #ifdef HAVE_ECC384
-        #define BENCH_ECC_SIZE  48
-    #else
-        #define BENCH_ECC_SIZE  32
-    #endif
-#endif
-
-/* Default to testing P-256 */
-static int bench_ecc_size = 32;
-
-void bench_eccMakeKey(int doAsync)
-{
-    int ret = 0, i, times, count, pending = 0;
-    const int keySize = bench_ecc_size;
-    ecc_key genKey[BENCH_MAX_PENDING];
-    double start;
-    const char**desc = bench_desc_words[lng_index];
-
-    /* clear for done cleanup */
-    XMEMSET(&genKey, 0, sizeof(genKey));
-
-    /* ECC Make Key */
-    bench_stats_start(&count, &start);
-    do {
-        /* while free pending slots in queue, submit ops */
-        for (times = 0; times < genTimes || pending > 0; ) {
-            bench_async_poll(&pending);
-
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&genKey[i]), 0, &times, genTimes, &pending)) {
-
-                    wc_ecc_free(&genKey[i]);
-                    ret = wc_ecc_init_ex(&genKey[i], HEAP_HINT, doAsync ? devId : INVALID_DEVID);
-                    if (ret < 0) {
-                        goto exit;
-                    }
-
-                    ret = wc_ecc_make_key(&gRng, keySize, &genKey[i]);
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&genKey[i]), 0, &times, &pending)) {
-                        goto exit;
-                    }
-                }
-            } /* for i */
-        } /* for times */
-        count += times;
-    } while (bench_stats_sym_check(start));
-exit:
-    bench_stats_asym_finish("ECC", keySize * 8, desc[2], doAsync, count, start, ret);
-
-    /* cleanup */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_ecc_free(&genKey[i]);
-    }
-}
-
-void bench_ecc(int doAsync)
-{
-    int ret = 0, i, times, count, pending = 0;
-    const int keySize = bench_ecc_size;
-    ecc_key genKey[BENCH_MAX_PENDING];
-#ifdef HAVE_ECC_DHE
-    ecc_key genKey2[BENCH_MAX_PENDING];
-#endif
-#if !defined(NO_ASN) && defined(HAVE_ECC_SIGN)
-#ifdef HAVE_ECC_VERIFY
-    int    verify[BENCH_MAX_PENDING];
-#endif
-#endif
-    word32 x[BENCH_MAX_PENDING];
-    double start;
-    const char**desc = bench_desc_words[lng_index];
-
-#ifdef HAVE_ECC_DHE
-    DECLARE_ARRAY(shared, byte, BENCH_MAX_PENDING, BENCH_ECC_SIZE, HEAP_HINT);
-#endif
-#if !defined(NO_ASN) && defined(HAVE_ECC_SIGN)
-    DECLARE_ARRAY(sig, byte, BENCH_MAX_PENDING, ECC_MAX_SIG_SIZE, HEAP_HINT);
-    DECLARE_ARRAY(digest, byte, BENCH_MAX_PENDING, BENCH_ECC_SIZE, HEAP_HINT);
-#endif
-
-    /* clear for done cleanup */
-    XMEMSET(&genKey, 0, sizeof(genKey));
-#ifdef HAVE_ECC_DHE
-    XMEMSET(&genKey2, 0, sizeof(genKey2));
-#endif
-
-    /* init keys */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        /* setup an context for each key */
-        if ((ret = wc_ecc_init_ex(&genKey[i], HEAP_HINT,
-                                    doAsync ? devId : INVALID_DEVID)) < 0) {
-            goto exit;
-        }
-        ret = wc_ecc_make_key(&gRng, keySize, &genKey[i]);
-    #ifdef WOLFSSL_ASYNC_CRYPT
-        ret = wc_AsyncWait(ret, &genKey[i].asyncDev, WC_ASYNC_FLAG_NONE);
-    #endif
-        if (ret < 0) {
-            goto exit;
-        }
-
-    #ifdef HAVE_ECC_DHE
-        if ((ret = wc_ecc_init_ex(&genKey2[i], HEAP_HINT, INVALID_DEVID)) < 0) {
-            goto exit;
-        }
-        if ((ret = wc_ecc_make_key(&gRng, keySize, &genKey2[i])) > 0) {
-            goto exit;
-        }
-    #endif
-    }
-
-#ifdef HAVE_ECC_DHE
-
-    /* ECC Shared Secret */
-    bench_stats_start(&count, &start);
-    do {
-        for (times = 0; times < agreeTimes || pending > 0; ) {
-            bench_async_poll(&pending);
-
-            /* while free pending slots in queue, submit ops */
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&genKey[i]), 1, &times, agreeTimes, &pending)) {
-                    x[i] = (word32)keySize;
-                    ret = wc_ecc_shared_secret(&genKey[i], &genKey2[i], shared[i], &x[i]);
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&genKey[i]), 1, &times, &pending)) {
-                        goto exit_ecdhe;
-                    }
-                }
-            } /* for i */
-        } /* for times */
-        count += times;
-    } while (bench_stats_sym_check(start));
-exit_ecdhe:
-    bench_stats_asym_finish("ECDHE", keySize * 8, desc[3], doAsync, count, start, ret);
-
-    if (ret < 0) {
-        goto exit;
-    }
-#endif /* HAVE_ECC_DHE */
-
-#if !defined(NO_ASN) && defined(HAVE_ECC_SIGN)
-
-    /* Init digest to sign */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        for (count = 0; count < keySize; count++) {
-            digest[i][count] = (byte)count;
-        }
-    }
-
-    /* ECC Sign */
-    bench_stats_start(&count, &start);
-    do {
-        for (times = 0; times < agreeTimes || pending > 0; ) {
-            bench_async_poll(&pending);
-
-            /* while free pending slots in queue, submit ops */
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&genKey[i]), 1, &times, agreeTimes, &pending)) {
-                    if (genKey[i].state == 0)
-                        x[i] = ECC_MAX_SIG_SIZE;
-                    ret = wc_ecc_sign_hash(digest[i], (word32)keySize, sig[i], &x[i],
-                                                            &gRng, &genKey[i]);
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&genKey[i]), 1, &times, &pending)) {
-                        goto exit_ecdsa_sign;
-                    }
-                }
-            } /* for i */
-        } /* for times */
-        count += times;
-    } while (bench_stats_sym_check(start));
-exit_ecdsa_sign:
-    bench_stats_asym_finish("ECDSA", keySize * 8, desc[4], doAsync, count, start, ret);
-
-    if (ret < 0) {
-        goto exit;
-    }
-
-#ifdef HAVE_ECC_VERIFY
-
-    /* ECC Verify */
-    bench_stats_start(&count, &start);
-    do {
-        for (times = 0; times < agreeTimes || pending > 0; ) {
-            bench_async_poll(&pending);
-
-            /* while free pending slots in queue, submit ops */
-            for (i = 0; i < BENCH_MAX_PENDING; i++) {
-                if (bench_async_check(&ret, BENCH_ASYNC_GET_DEV(&genKey[i]), 1, &times, agreeTimes, &pending)) {
-                    if (genKey[i].state == 0)
-                        verify[i] = 0;
-                    ret = wc_ecc_verify_hash(sig[i], x[i], digest[i],
-                                        (word32)keySize, &verify[i], &genKey[i]);
-                    if (!bench_async_handle(&ret, BENCH_ASYNC_GET_DEV(&genKey[i]), 1, &times, &pending)) {
-                        goto exit_ecdsa_verify;
-                    }
-                }
-            } /* for i */
-        } /* for times */
-        count += times;
-    } while (bench_stats_sym_check(start));
-exit_ecdsa_verify:
-    bench_stats_asym_finish("ECDSA", keySize * 8, desc[5], doAsync, count, start, ret);
-#endif /* HAVE_ECC_VERIFY */
-#endif /* !NO_ASN && HAVE_ECC_SIGN */
-
-exit:
-
-    /* cleanup */
-    for (i = 0; i < BENCH_MAX_PENDING; i++) {
-        wc_ecc_free(&genKey[i]);
-    #ifdef HAVE_ECC_DHE
-        wc_ecc_free(&genKey2[i]);
-    #endif
-    }
-
-#ifdef HAVE_ECC_DHE
-    FREE_ARRAY(shared, BENCH_MAX_PENDING, HEAP_HINT);
-#endif
-#if !defined(NO_ASN) && defined(HAVE_ECC_SIGN)
-    FREE_ARRAY(sig, BENCH_MAX_PENDING, HEAP_HINT);
-    FREE_ARRAY(digest, BENCH_MAX_PENDING, HEAP_HINT);
-#endif
-}
-
-
-#ifdef HAVE_ECC_ENCRYPT
-void bench_eccEncrypt(void)
-{
-    ecc_key userA, userB;
-    const int keySize = bench_ecc_size;
-    byte    msg[48];
-    byte    out[80];
-    word32  outSz   = sizeof(out);
-    word32  bench_plainSz = BENCH_SIZE;
-    int     ret, i, count;
-    double start;
-    const char**desc = bench_desc_words[lng_index];
-
-    ret = wc_ecc_init_ex(&userA, HEAP_HINT, devId);
-    if (ret != 0) {
-        printf("wc_ecc_encrypt make key A failed: %d\n", ret);
-        return;
-    }
-
-    ret = wc_ecc_init_ex(&userB, HEAP_HINT, devId);
-    if (ret != 0) {
-        printf("wc_ecc_encrypt make key B failed: %d\n", ret);
-        wc_ecc_free(&userA);
-        return;
-    }
-
-    ret = wc_ecc_make_key(&gRng, keySize, &userA);
-#ifdef WOLFSSL_ASYNC_CRYPT
-    ret = wc_AsyncWait(ret, &userA.asyncDev, WC_ASYNC_FLAG_NONE);
-#endif
-    if (ret != 0)
-        goto exit;
-    ret = wc_ecc_make_key(&gRng, keySize, &userB);
-#ifdef WOLFSSL_ASYNC_CRYPT
-    ret = wc_AsyncWait(ret, &userB.asyncDev, WC_ASYNC_FLAG_NONE);
-#endif
-    if (ret != 0)
-        goto exit;
-
-    for (i = 0; i < (int)sizeof(msg); i++)
-        msg[i] = i;
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < ntimes; i++) {
-            /* encrypt msg to B */
-            ret = wc_ecc_encrypt(&userA, &userB, msg, sizeof(msg), out, &outSz, NULL);
-            if (ret != 0) {
-                printf("wc_ecc_encrypt failed! %d\n", ret);
-                goto exit_enc;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-exit_enc:
-    bench_stats_asym_finish("ECC", keySize * 8, desc[6], 0, count, start, ret);
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < ntimes; i++) {
-            /* decrypt msg from A */
-            ret = wc_ecc_decrypt(&userB, &userA, out, outSz, bench_plain, &bench_plainSz, NULL);
-            if (ret != 0) {
-                printf("wc_ecc_decrypt failed! %d\n", ret);
-                goto exit_dec;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-exit_dec:
-    bench_stats_asym_finish("ECC", keySize * 8, desc[7], 0, count, start, ret);
-
-exit:
-
-    /* cleanup */
-    wc_ecc_free(&userB);
-    wc_ecc_free(&userA);
-}
-#endif
-#endif /* HAVE_ECC */
-
-#ifdef HAVE_CURVE25519
-void bench_curve25519KeyGen(void)
-{
-    curve25519_key genKey;
-    double start;
-    int    ret = 0, i, count;
-    const char**desc = bench_desc_words[lng_index];
-
-    /* Key Gen */
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < genTimes; i++) {
-            ret = wc_curve25519_make_key(&gRng, 32, &genKey);
-            wc_curve25519_free(&genKey);
-            if (ret != 0) {
-                printf("wc_curve25519_make_key failed: %d\n", ret);
-                break;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_asym_finish("CURVE", 25519, desc[2], 0, count, start, ret);
-}
-
-#ifdef HAVE_CURVE25519_SHARED_SECRET
-void bench_curve25519KeyAgree(void)
-{
-    curve25519_key genKey, genKey2;
-    double start;
-    int    ret, i, count;
-    byte   shared[32];
-	const char**desc = bench_desc_words[lng_index];
-    word32 x = 0;
-
-    wc_curve25519_init(&genKey);
-    wc_curve25519_init(&genKey2);
-
-    ret = wc_curve25519_make_key(&gRng, 32, &genKey);
-    if (ret != 0) {
-        printf("curve25519_make_key failed\n");
-        return;
-    }
-    ret = wc_curve25519_make_key(&gRng, 32, &genKey2);
-    if (ret != 0) {
-        printf("curve25519_make_key failed: %d\n", ret);
-        wc_curve25519_free(&genKey);
-        return;
-    }
-
-    /* Shared secret */
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < agreeTimes; i++) {
-            x = sizeof(shared);
-            ret = wc_curve25519_shared_secret(&genKey, &genKey2, shared, &x);
-            if (ret != 0) {
-                printf("curve25519_shared_secret failed: %d\n", ret);
-                goto exit;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-exit:
-    bench_stats_asym_finish("CURVE", 25519, desc[3], 0, count, start, ret);
-
-    wc_curve25519_free(&genKey2);
-    wc_curve25519_free(&genKey);
-}
-#endif /* HAVE_CURVE25519_SHARED_SECRET */
-#endif /* HAVE_CURVE25519 */
-
-#ifdef HAVE_ED25519
-void bench_ed25519KeyGen(void)
-{
-    ed25519_key genKey;
-    double start;
-    int    i, count;
-    const char**desc = bench_desc_words[lng_index];
-
-    /* Key Gen */
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < genTimes; i++) {
-            wc_ed25519_init(&genKey);
-            (void)wc_ed25519_make_key(&gRng, 32, &genKey);
-            wc_ed25519_free(&genKey);
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_asym_finish("ED", 25519, desc[2], 0, count, start, 0);
-}
-
-
-void bench_ed25519KeySign(void)
-{
-    int    ret;
-    ed25519_key genKey;
-#ifdef HAVE_ED25519_SIGN
-    double start;
-    int    i, count;
-    byte   sig[ED25519_SIG_SIZE];
-    byte   msg[512];
-    word32 x = 0;
-#endif
-    const char**desc = bench_desc_words[lng_index];
-
-    wc_ed25519_init(&genKey);
-
-    ret = wc_ed25519_make_key(&gRng, ED25519_KEY_SIZE, &genKey);
-    if (ret != 0) {
-        printf("ed25519_make_key failed\n");
-        return;
-    }
-
-#ifdef HAVE_ED25519_SIGN
-    /* make dummy msg */
-    for (i = 0; i < (int)sizeof(msg); i++)
-        msg[i] = (byte)i;
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < agreeTimes; i++) {
-            x = sizeof(sig);
-            ret = wc_ed25519_sign_msg(msg, sizeof(msg), sig, &x, &genKey);
-            if (ret != 0) {
-                printf("ed25519_sign_msg failed\n");
-                goto exit_ed_sign;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-exit_ed_sign:
-    bench_stats_asym_finish("ED", 25519, desc[4], 0, count, start, ret);
-
-#ifdef HAVE_ED25519_VERIFY
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < agreeTimes; i++) {
-            int verify = 0;
-            ret = wc_ed25519_verify_msg(sig, x, msg, sizeof(msg), &verify,
-                                        &genKey);
-            if (ret != 0 || verify != 1) {
-                printf("ed25519_verify_msg failed\n");
-                goto exit_ed_verify;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-exit_ed_verify:
-    bench_stats_asym_finish("ED", 25519, desc[5], 0, count, start, ret);
-#endif /* HAVE_ED25519_VERIFY */
-#endif /* HAVE_ED25519_SIGN */
-
-    wc_ed25519_free(&genKey);
-}
-#endif /* HAVE_ED25519 */
-
-#ifdef HAVE_CURVE448
-void bench_curve448KeyGen(void)
-{
-    curve448_key genKey;
-    double start;
-    int    ret = 0, i, count;
-    const char**desc = bench_desc_words[lng_index];
-
-    /* Key Gen */
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < genTimes; i++) {
-            ret = wc_curve448_make_key(&gRng, 56, &genKey);
-            wc_curve448_free(&genKey);
-            if (ret != 0) {
-                printf("wc_curve448_make_key failed: %d\n", ret);
-                break;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_asym_finish("CURVE", 448, desc[2], 0, count, start, ret);
-}
-
-#ifdef HAVE_CURVE448_SHARED_SECRET
-void bench_curve448KeyAgree(void)
-{
-    curve448_key genKey, genKey2;
-    double start;
-    int    ret, i, count;
-    byte   shared[56];
-	const char**desc = bench_desc_words[lng_index];
-    word32 x = 0;
-
-    wc_curve448_init(&genKey);
-    wc_curve448_init(&genKey2);
-
-    ret = wc_curve448_make_key(&gRng, 56, &genKey);
-    if (ret != 0) {
-        printf("curve448_make_key failed\n");
-        return;
-    }
-    ret = wc_curve448_make_key(&gRng, 56, &genKey2);
-    if (ret != 0) {
-        printf("curve448_make_key failed: %d\n", ret);
-        wc_curve448_free(&genKey);
-        return;
-    }
-
-    /* Shared secret */
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < agreeTimes; i++) {
-            x = sizeof(shared);
-            ret = wc_curve448_shared_secret(&genKey, &genKey2, shared, &x);
-            if (ret != 0) {
-                printf("curve448_shared_secret failed: %d\n", ret);
-                goto exit;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-exit:
-    bench_stats_asym_finish("CURVE", 448, desc[3], 0, count, start, ret);
-
-    wc_curve448_free(&genKey2);
-    wc_curve448_free(&genKey);
-}
-#endif /* HAVE_CURVE448_SHARED_SECRET */
-#endif /* HAVE_CURVE448 */
-
-#ifdef HAVE_ED448
-void bench_ed448KeyGen(void)
-{
-    ed448_key genKey;
-    double start;
-    int    i, count;
-    const char**desc = bench_desc_words[lng_index];
-
-    /* Key Gen */
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < genTimes; i++) {
-            wc_ed448_init(&genKey);
-            (void)wc_ed448_make_key(&gRng, ED448_KEY_SIZE, &genKey);
-            wc_ed448_free(&genKey);
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-    bench_stats_asym_finish("ED", 448, desc[2], 0, count, start, 0);
-}
-
-
-void bench_ed448KeySign(void)
-{
-    int    ret;
-    ed448_key genKey;
-#ifdef HAVE_ED448_SIGN
-    double start;
-    int    i, count;
-    byte   sig[ED448_SIG_SIZE];
-    byte   msg[512];
-    word32 x = 0;
-#endif
-    const char**desc = bench_desc_words[lng_index];
-
-    wc_ed448_init(&genKey);
-
-    ret = wc_ed448_make_key(&gRng, ED448_KEY_SIZE, &genKey);
-    if (ret != 0) {
-        printf("ed448_make_key failed\n");
-        return;
-    }
-
-#ifdef HAVE_ED448_SIGN
-    /* make dummy msg */
-    for (i = 0; i < (int)sizeof(msg); i++)
-        msg[i] = (byte)i;
-
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < agreeTimes; i++) {
-            x = sizeof(sig);
-            ret = wc_ed448_sign_msg(msg, sizeof(msg), sig, &x, &genKey,
-                                    NULL, 0);
-            if (ret != 0) {
-                printf("ed448_sign_msg failed\n");
-                goto exit_ed_sign;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-exit_ed_sign:
-    bench_stats_asym_finish("ED", 448, desc[4], 0, count, start, ret);
-
-#ifdef HAVE_ED448_VERIFY
-    bench_stats_start(&count, &start);
-    do {
-        for (i = 0; i < agreeTimes; i++) {
-            int verify = 0;
-            ret = wc_ed448_verify_msg(sig, x, msg, sizeof(msg), &verify,
-                                      &genKey, NULL, 0);
-            if (ret != 0 || verify != 1) {
-                printf("ed448_verify_msg failed\n");
-                goto exit_ed_verify;
-            }
-        }
-        count += i;
-    } while (bench_stats_sym_check(start));
-exit_ed_verify:
-    bench_stats_asym_finish("ED", 448, desc[5], 0, count, start, ret);
-#endif /* HAVE_ED448_VERIFY */
-#endif /* HAVE_ED448_SIGN */
-
-    wc_ed448_free(&genKey);
-}
-#endif /* HAVE_ED448 */
-
-#ifndef HAVE_STACK_SIZE
-#if defined(_WIN32) && !defined(INTIME_RTOS)
-
-    #define WIN32_LEAN_AND_MEAN
-    #include <windows.h>
-
-    double current_time(int reset)
-    {
-        static int init = 0;
-        static LARGE_INTEGER freq;
-
-        LARGE_INTEGER count;
-
-        (void)reset;
-
-        if (!init) {
-            QueryPerformanceFrequency(&freq);
-            init = 1;
-        }
-
-        QueryPerformanceCounter(&count);
-
-        return (double)count.QuadPart / freq.QuadPart;
-    }
-
-#elif defined MICROCHIP_PIC32
-    #if defined(WOLFSSL_MICROCHIP_PIC32MZ)
-        #define CLOCK 80000000.0
-    #else
-        #define CLOCK 40000000.0
-    #endif
-    extern void WriteCoreTimer(word32 t);
-    extern word32 ReadCoreTimer(void);
-    double current_time(int reset)
-    {
-        unsigned int ns;
-
-        if (reset) {
-            WriteCoreTimer(0);
-        }
-
-        /* get timer in ns */
-        ns = ReadCoreTimer();
-
-        /* return seconds as a double */
-        return ( ns / CLOCK * 2.0);
-    }
-
-#elif defined(WOLFSSL_IAR_ARM_TIME) || defined (WOLFSSL_MDK_ARM) || \
-      defined(WOLFSSL_USER_CURRTIME) || defined(WOLFSSL_CURRTIME_REMAP)
-    /* declared above at line 239 */
-    /* extern   double current_time(int reset); */
-
-#elif defined(FREERTOS)
-
-    #include "task.h"
-#if defined(WOLFSSL_ESPIDF)
-    /* proto type definition */
-    int construct_argv();
-    extern char* __argv[22];
-#endif
-    double current_time(int reset)
-    {
-        portTickType tickCount;
-
-        (void) reset;
-
-        /* tick count == ms, if configTICK_RATE_HZ is set to 1000 */
-        tickCount = xTaskGetTickCount();
-        return (double)tickCount / 1000;
-    }
-
-#elif defined (WOLFSSL_TIRTOS)
-
-    extern double current_time(int reset);
-
-#elif defined(FREESCALE_MQX)
-
-    double current_time(int reset)
-    {
-        TIME_STRUCT tv;
-        _time_get(&tv);
-
-        return (double)tv.SECONDS + (double)tv.MILLISECONDS / 1000;
-    }
-
-#elif defined(FREESCALE_KSDK_BM)
-
-    double current_time(int reset)
-    {
-        return (double)OSA_TimeGetMsec() / 1000;
-    }
-
-#elif defined(WOLFSSL_EMBOS)
-
-    #include "RTOS.h"
-
-    double current_time(int reset)
-    {
-        double time_now;
-        double current_s = OS_GetTime() / 1000.0;
-        double current_us = OS_GetTime_us() / 1000000.0;
-        time_now = (double)( current_s + current_us);
-
-        (void) reset;
-
-        return time_now;
-    }
-#elif defined(WOLFSSL_SGX)
-    double current_time(int reset);
-
-#elif defined(WOLFSSL_DEOS)
-    double current_time(int reset)
-    {
-        const uint32_t systemTickTimeInHz = 1000000 / systemTickInMicroseconds();
-        uint32_t *systemTickPtr = systemTickPointer();
-
-        (void)reset;
-
-        return (double) *systemTickPtr/systemTickTimeInHz;
-    }
-
-#elif defined(MICRIUM)
-    double current_time(int reset)
-    {
-        CPU_ERR err;
-
-        (void)reset;
-        return (double) CPU_TS_Get32()/CPU_TS_TmrFreqGet(&err);
-    }
-#elif defined(WOLFSSL_ZEPHYR)
-
-    #include <time.h>
-
-    double current_time(int reset)
-    {
-        (void)reset;
-
-     #if defined(CONFIG_ARCH_POSIX)
-         k_cpu_idle();
-     #endif
-
-        return (double)k_uptime_get() / 1000;
-    }
-
-#elif defined(WOLFSSL_NETBURNER)
-    #include <predef.h>
-    #include <utils.h>
-    #include <constants.h>
-
-    double current_time(int reset)
-    {
-        DWORD ticks = TimeTick; /* ticks since system start */
-        (void)reset;
-
-        return (double) ticks/TICKS_PER_SECOND;
-    }
-
-#elif defined(THREADX)
-    #include "tx_api.h"
-    double current_time(int reset)
-    {
-        (void)reset;
-        return (double) tx_time_get() / TX_TIMER_TICKS_PER_SECOND;
-    }
-
-#elif defined(WOLFSSL_XILINX)
-    #ifndef XPAR_CPU_CORTEXA53_0_TIMESTAMP_CLK_FREQ
-    #define XPAR_CPU_CORTEXA53_0_TIMESTAMP_CLK_FREQ 50000000
-    #endif
-    #ifndef COUNTS_PER_SECOND
-    #define COUNTS_PER_SECOND     XPAR_CPU_CORTEXA53_0_TIMESTAMP_CLK_FREQ
-    #endif
-
-    double current_time(int reset)
-    {
-        double timer;
-        uint64_t cntPct = 0;
-        asm volatile("mrs %0, CNTPCT_EL0" : "=r" (cntPct));
-
-        /* Convert to milliseconds */
-        timer = (double)(cntPct / (COUNTS_PER_SECOND / 1000));
-        /* Convert to seconds.millisecond */
-        timer /= 1000;
-        return timer;
-    }
-
-#else
-
-    #include <sys/time.h>
-
-    double current_time(int reset)
-    {
-        struct timeval tv;
-
-        (void)reset;
-
-        gettimeofday(&tv, 0);
-
-        return (double)tv.tv_sec + (double)tv.tv_usec / 1000000;
-    }
-
-#endif /* _WIN32 */
-#endif /* !HAVE_STACK_SIZE */
-
-#if defined(HAVE_GET_CYCLES)
-
-static WC_INLINE word64 get_intel_cycles(void)
-{
-    unsigned int lo_c, hi_c;
-    __asm__ __volatile__ (
-        "cpuid\n\t"
-        "rdtsc"
-            : "=a"(lo_c), "=d"(hi_c)   /* out */
-            : "a"(0)                   /* in */
-            : "%ebx", "%ecx");         /* clobber */
-    return ((word64)lo_c) | (((word64)hi_c) << 32);
-}
-
-#endif /* HAVE_GET_CYCLES */
-
-void benchmark_configure(int block_size)
-{
-    /* must be greater than 0 */
-    if (block_size > 0) {
-        numBlocks = numBlocks * bench_size / block_size;
-        bench_size = (word32)block_size;
-    }
-}
-
-#ifndef NO_MAIN_DRIVER
-
-#ifndef MAIN_NO_ARGS
-
-#ifndef WOLFSSL_BENCHMARK_ALL
-/* Display the algorithm string and keep to 80 characters per line.
- *
- * str   Algorithm string to print.
- * line  Length of line used so far.
- */
-static void print_alg(const char* str, int* line)
-{
-    int optLen;
-
-    optLen = (int)XSTRLEN(str) + 1;
-    if (optLen + *line > 80) {
-        printf("\n             ");
-        *line = 13;
-    }
-    *line += optLen;
-    printf(" %s", str);
-}
-#endif
-
-/* Display the usage options of the benchmark program. */
-static void Usage(void)
-{
-#ifndef WOLFSSL_BENCHMARK_ALL
-    int i;
-    int line;
-#endif
-
-    printf("benchmark\n");
-    printf("%s", bench_Usage_msg1[lng_index][0]);    /* option -? */
-    printf("%s", bench_Usage_msg1[lng_index][1]);    /* option -csv */
-    printf("%s", bench_Usage_msg1[lng_index][2]);    /* option -base10 */
-#if defined(HAVE_AESGCM) || defined(HAVE_AESCCM)
-    printf("%s", bench_Usage_msg1[lng_index][3]);    /* option -no_add */
-#endif
-    printf("%s", bench_Usage_msg1[lng_index][4]);    /* option -dgst_full */
-#ifndef NO_RSA
-    printf("%s", bench_Usage_msg1[lng_index][5]);    /* option -ras_sign */
-    #ifdef WOLFSSL_KEY_GEN
-    printf("%s", bench_Usage_msg1[lng_index][6]);    /* option -rsa-sz */
-    #endif
-#endif
-#if !defined(NO_DH) && defined(HAVE_FFDHE_2048)
-    printf("%s", bench_Usage_msg1[lng_index][7]);    /* option -ffdhe2048 */
-#endif
-#if !defined(NO_DH) && defined(HAVE_FFDHE_3072)
-    printf("%s", bench_Usage_msg1[lng_index][8]);    /* option -ffdhe3072 */
-#endif
-#if defined(HAVE_ECC) && !defined(NO_ECC256)
-    printf("%s", bench_Usage_msg1[lng_index][9]);    /* option -p256 */
-#endif
-#if defined(HAVE_ECC) && defined(HAVE_ECC384)
-    printf("%s", bench_Usage_msg1[lng_index][10]);   /* option -p384 */
-#endif
-#ifndef WOLFSSL_BENCHMARK_ALL
-    printf("%s", bench_Usage_msg1[lng_index][11]);   /* option -<alg> */
-    printf("             ");
-    line = 13;
-    for (i=0; bench_cipher_opt[i].str != NULL; i++)
-        print_alg(bench_cipher_opt[i].str + 1, &line);
-    printf("\n             ");
-    line = 13;
-    for (i=0; bench_digest_opt[i].str != NULL; i++)
-        print_alg(bench_digest_opt[i].str + 1, &line);
-    printf("\n             ");
-    line = 13;
-    for (i=0; bench_mac_opt[i].str != NULL; i++)
-        print_alg(bench_mac_opt[i].str + 1, &line);
-    printf("\n             ");
-    line = 13;
-    for (i=0; bench_asym_opt[i].str != NULL; i++)
-        print_alg(bench_asym_opt[i].str + 1, &line);
-    printf("\n             ");
-    line = 13;
-    for (i=0; bench_other_opt[i].str != NULL; i++)
-        print_alg(bench_other_opt[i].str + 1, &line);
-    printf("\n");
-#endif
-    printf("%s", bench_Usage_msg1[lng_index][12]);   /* option -lng */
-    printf("%s", bench_Usage_msg1[lng_index][13]);   /* option <num> */
-#if defined(WOLFSSL_ASYNC_CRYPT) && !defined(WC_NO_ASYNC_THREADING)
-    printf("%s", bench_Usage_msg1[lng_index][14]);   /* option -threads <num> */
-#endif
-    printf("%s", bench_Usage_msg1[lng_index][15]);   /* option -print */
-}
-
-/* Match the command line argument with the string.
- *
- * arg  Command line argument.
- * str  String to check for.
- * return 1 if the command line argument matches the string, 0 otherwise.
- */
-static int string_matches(const char* arg, const char* str)
-{
-    int len = (int)XSTRLEN(str) + 1;
-    return XSTRNCMP(arg, str, len) == 0;
-}
-#endif /* MAIN_NO_ARGS */
-
-#ifdef WOLFSSL_ESPIDF
-int wolf_benchmark_task( )
-#elif defined(MAIN_NO_ARGS)
-int main()
-#else
-int main(int argc, char** argv)
-#endif
-{
-    int ret = 0;
-#ifndef MAIN_NO_ARGS
-    int optMatched;
-#ifdef WOLFSSL_ESPIDF
-    int argc = construct_argv();
-    char** argv = (char**)__argv;
-#endif
-#ifndef WOLFSSL_BENCHMARK_ALL
-    int i;
-#endif
-#endif
-
-    benchmark_static_init();
-
-#ifndef MAIN_NO_ARGS
-    while (argc > 1) {
-        if (string_matches(argv[1], "-?")) {
-            if(--argc>1){
-                lng_index = XATOI((++argv)[1]);
-                if(lng_index<0||lng_index>1) {
-                    lng_index = 0;
-                }
-            }
-            Usage();
-            return 0;
-        }
-        else if (string_matches(argv[1], "-v")) {
-            printf("-----------------------------------------------------------"
-                   "-------------------\n wolfSSL version %s\n-----------------"
-                   "-----------------------------------------------------------"
-                   "--\n", LIBWOLFSSL_VERSION_STRING);
-            return 0;
-        }
-        else if (string_matches(argv[1], "-lng")) {
-            argc--;
-            argv++;
-            if(argc>1) {
-                lng_index = XATOI(argv[1]);
-                if(lng_index<0||lng_index>1){
-                    printf("invalid number(%d) is specified. [<num> :0-1]\n",lng_index);
-                    lng_index = 0;
-                }
-            }
-        }
-        else if (string_matches(argv[1], "-base10"))
-            base2 = 0;
-#if defined(HAVE_AESGCM) || defined(HAVE_AESCCM)
-        else if (string_matches(argv[1], "-no_aad"))
-            aesAuthAddSz = 0;
-#endif
-        else if (string_matches(argv[1], "-dgst_full"))
-            digest_stream = 0;
-#ifndef NO_RSA
-        else if (string_matches(argv[1], "-rsa_sign"))
-            rsa_sign_verify = 1;
-#endif
-#if !defined(NO_DH) && defined(HAVE_FFDHE_2048)
-        else if (string_matches(argv[1], "-ffdhe2048"))
-            use_ffdhe = 2048;
-#endif
-#if !defined(NO_DH) && defined(HAVE_FFDHE_3072)
-        else if (string_matches(argv[1], "-ffdhe3072"))
-            use_ffdhe = 3072;
-#endif
-#if defined(HAVE_ECC) && !defined(NO_ECC256)
-        else if (string_matches(argv[1], "-p256"))
-            bench_ecc_size = 32;
-#endif
-#if defined(HAVE_ECC) && defined(HAVE_ECC384)
-        else if (string_matches(argv[1], "-p384"))
-            bench_ecc_size = 48;
-#endif
-#ifdef BENCH_ASYM
-        else if (string_matches(argv[1], "-csv")) {
-            csv_format = 1;
-            csv_header_count = 1;
-        }
-#endif
-#if defined(WOLFSSL_ASYNC_CRYPT) && !defined(WC_NO_ASYNC_THREADING)
-        else if (string_matches(argv[1], "-threads")) {
-            argc--;
-            argv++;
-            if (argc > 1) {
-                g_threadCount = XATOI(argv[1]);
-                if (g_threadCount < 1 || lng_index > 128){
-                    printf("invalid number(%d) is specified. [<num> :1-128]\n",
-                        g_threadCount);
-                    g_threadCount = 0;
-                }
-            }
-        }
-#endif
-        else if (string_matches(argv[1], "-print")) {
-            gPrintStats = 1;
-        }
-        else if (argv[1][0] == '-') {
-            optMatched = 0;
-#ifndef WOLFSSL_BENCHMARK_ALL
-            /* Check known algorithm choosing command line options. */
-            /* Known cipher algorithms */
-            for (i=0; !optMatched && bench_cipher_opt[i].str != NULL; i++) {
-                if (string_matches(argv[1], bench_cipher_opt[i].str)) {
-                    bench_cipher_algs |= bench_cipher_opt[i].val;
-                    bench_all = 0;
-                    optMatched = 1;
-                }
-            }
-            /* Known digest algorithms */
-            for (i=0; !optMatched && bench_digest_opt[i].str != NULL; i++) {
-                if (string_matches(argv[1], bench_digest_opt[i].str)) {
-                    bench_digest_algs |= bench_digest_opt[i].val;
-                    bench_all = 0;
-                    optMatched = 1;
-                }
-            }
-            /* Known MAC algorithms */
-            for (i=0; !optMatched && bench_mac_opt[i].str != NULL; i++) {
-                if (string_matches(argv[1], bench_mac_opt[i].str)) {
-                    bench_mac_algs |= bench_mac_opt[i].val;
-                    bench_all = 0;
-                    optMatched = 1;
-                }
-            }
-            /* Known asymmetric algorithms */
-            for (i=0; !optMatched && bench_asym_opt[i].str != NULL; i++) {
-                if (string_matches(argv[1], bench_asym_opt[i].str)) {
-                    bench_asym_algs |= bench_asym_opt[i].val;
-                    bench_all = 0;
-                    optMatched = 1;
-                }
-            }
-            /* Other known cryptographic algorithms */
-            for (i=0; !optMatched && bench_other_opt[i].str != NULL; i++) {
-                if (string_matches(argv[1], bench_other_opt[i].str)) {
-                    bench_other_algs |= bench_other_opt[i].val;
-                    bench_all = 0;
-                    optMatched = 1;
-                }
-            }
-#endif
-            if (!optMatched) {
-                printf("Option not recognized: %s\n", argv[1]);
-                Usage();
-                return 1;
-            }
-        }
-        else {
-            /* parse for block size */
-            benchmark_configure(XATOI(argv[1]));
-        }
-        argc--;
-        argv++;
-    }
-#endif /* MAIN_NO_ARGS */
-
-#ifdef HAVE_STACK_SIZE
-    ret = StackSizeCheck(NULL, benchmark_test);
-#else
-    ret = benchmark_test(NULL);
-#endif
-
-    return ret;
-}
-#endif /* !NO_MAIN_DRIVER */
-
-#else
-    #ifndef NO_MAIN_DRIVER
-        int main() { return 0; }
-    #endif
-#endif /* !NO_CRYPT_BENCHMARK */
diff --git a/client/wolfssl/wolfcrypt/benchmark/benchmark.h b/client/wolfssl/wolfcrypt/benchmark/benchmark.h
deleted file mode 100644
index c2771bb..0000000
--- a/client/wolfssl/wolfcrypt/benchmark/benchmark.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* wolfcrypt/benchmark/benchmark.h
- *
- * Copyright (C) 2006-2020 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- */
-
-
-#ifndef WOLFCRYPT_BENCHMARK_H
-#define WOLFCRYPT_BENCHMARK_H
-
-
-#ifdef __cplusplus
-    extern "C" {
-#endif
-
-/* run all benchmark entry */
-#ifdef HAVE_STACK_SIZE
-THREAD_RETURN WOLFSSL_THREAD benchmark_test(void* args);
-#else
-int benchmark_test(void *args);
-#endif
-
-/* individual benchmarks */
-int  benchmark_init(void);
-int  benchmark_free(void);
-void benchmark_configure(int block_size);
-
-void bench_des(int);
-void bench_idea(void);
-void bench_arc4(int);
-void bench_hc128(void);
-void bench_rabbit(void);
-void bench_chacha(void);
-void bench_chacha20_poly1305_aead(void);
-void bench_aescbc(int);
-void bench_aesgcm(int);
-void bench_aesccm(void);
-void bench_aesecb(int);
-void bench_aesxts(void);
-void bench_aesctr(void);
-void bench_aescfb(void);
-void bench_aesofb(void);
-void bench_poly1305(void);
-void bench_camellia(void);
-void bench_md5(int);
-void bench_sha(int);
-void bench_sha224(int);
-void bench_sha256(int);
-void bench_sha384(int);
-void bench_sha512(int);
-void bench_sha3_224(int);
-void bench_sha3_256(int);
-void bench_sha3_384(int);
-void bench_sha3_512(int);
-int  bench_ripemd(void);
-void bench_cmac(void);
-void bench_scrypt(void);
-void bench_hmac_md5(int);
-void bench_hmac_sha(int);
-void bench_hmac_sha224(int);
-void bench_hmac_sha256(int);
-void bench_hmac_sha384(int);
-void bench_hmac_sha512(int);
-void bench_rsaKeyGen(int);
-void bench_rsaKeyGen_size(int, int);
-void bench_rsa(int);
-void bench_rsa_key(int, int);
-void bench_dh(int);
-void bench_eccMakeKey(int);
-void bench_ecc(int);
-void bench_eccEncrypt(void);
-void bench_curve25519KeyGen(void);
-void bench_curve25519KeyAgree(void);
-void bench_ed25519KeyGen(void);
-void bench_ed25519KeySign(void);
-void bench_curve448KeyGen(void);
-void bench_curve448KeyAgree(void);
-void bench_ed448KeyGen(void);
-void bench_ed448KeySign(void);
-void bench_ntru(void);
-void bench_ntruKeyGen(void);
-void bench_rng(void);
-void bench_blake2b(void);
-void bench_blake2s(void);
-void bench_pbkdf2(void);
-
-void bench_stats_print(void);
-
-
-#ifdef __cplusplus
-    }  /* extern "C" */
-#endif
-
-
-#endif /* WOLFCRYPT_BENCHMARK_H */
-
diff --git a/client/wolfssl/wolfcrypt/benchmark/benchmark.sln b/client/wolfssl/wolfcrypt/benchmark/benchmark.sln
deleted file mode 100644
index 6c55572..0000000
--- a/client/wolfssl/wolfcrypt/benchmark/benchmark.sln
+++ /dev/null
@@ -1,59 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchmark", "benchmark.vcproj", "{615AEC46-5595-4DEA-9490-DBD5DE0F8772}"
-	ProjectSection(ProjectDependencies) = postProject
-		{73973223-5EE8-41CA-8E88-1D60E89A237B} = {73973223-5EE8-41CA-8E88-1D60E89A237B}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wolfssl", "..\..\wolfssl.vcxproj", "{73973223-5EE8-41CA-8E88-1D60E89A237B}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		DLL Debug|Win32 = DLL Debug|Win32
-		DLL Debug|x64 = DLL Debug|x64
-		DLL Release|Win32 = DLL Release|Win32
-		DLL Release|x64 = DLL Release|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Debug|Win32.ActiveCfg = Debug|Win32
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Debug|Win32.Build.0 = Debug|Win32
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Debug|x64.ActiveCfg = Debug|x64
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Debug|x64.Build.0 = Debug|x64
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Debug|Win32.ActiveCfg = Debug|Win32
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Debug|Win32.Build.0 = Debug|Win32
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Debug|x64.ActiveCfg = Debug|x64
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Debug|x64.Build.0 = Debug|x64
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Release|Win32.ActiveCfg = Release|Win32
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Release|Win32.Build.0 = Release|Win32
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Release|x64.ActiveCfg = Release|x64
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Release|x64.Build.0 = Release|x64
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Release|Win32.ActiveCfg = Release|Win32
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Release|Win32.Build.0 = Release|Win32
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Release|x64.ActiveCfg = Release|x64
-		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Release|x64.Build.0 = Release|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|Win32.Build.0 = Debug|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|x64.ActiveCfg = Debug|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|x64.Build.0 = Debug|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Debug|x64.Build.0 = DLL Debug|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Release|x64.ActiveCfg = DLL Release|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Release|x64.Build.0 = DLL Release|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|Win32.ActiveCfg = Release|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|Win32.Build.0 = Release|Win32
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|x64.ActiveCfg = Release|x64
-		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/client/wolfssl/wolfcrypt/benchmark/benchmark.vcproj b/client/wolfssl/wolfcrypt/benchmark/benchmark.vcproj
deleted file mode 100644
index 86c58c9..0000000
--- a/client/wolfssl/wolfcrypt/benchmark/benchmark.vcproj
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="benchmark"
-	ProjectGUID="{615AEC46-5595-4DEA-9490-DBD5DE0F8772}"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../..;../../IDE/WIN;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WOLFSSL_LIB;WOLFSSL_USER_SETTINGS;"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Ws2_32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../..;../../IDE/WIN;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WOLFSSL_LIB;WOLFSSL_USER_SETTINGS;"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Ws2_32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\benchmark.c"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/client/wolfssl/wolfcrypt/benchmark/include.am b/client/wolfssl/wolfcrypt/benchmark/include.am
deleted file mode 100644
index d91a701..0000000
--- a/client/wolfssl/wolfcrypt/benchmark/include.am
+++ /dev/null
@@ -1,14 +0,0 @@
-# vim:ft=automake
-# All paths should be given relative to the root
-
-if BUILD_WOLFCRYPT_TESTS
-noinst_PROGRAMS += wolfcrypt/benchmark/benchmark
-wolfcrypt_benchmark_benchmark_SOURCES      = wolfcrypt/benchmark/benchmark.c
-wolfcrypt_benchmark_benchmark_LDADD        = src/libwolfssl.la $(LIB_STATIC_ADD)
-wolfcrypt_benchmark_benchmark_DEPENDENCIES = src/libwolfssl.la
-noinst_HEADERS += wolfcrypt/benchmark/benchmark.h
-endif
-EXTRA_DIST += wolfcrypt/benchmark/benchmark.sln 
-EXTRA_DIST += wolfcrypt/benchmark/benchmark.vcproj
-EXTRA_DIST += wolfcrypt/benchmark/README.md
-DISTCLEANFILES+= wolfcrypt/benchmark/.libs/benchmark