From b4b1739783f0233b9a27cefcdc292b9305f4e892 Mon Sep 17 00:00:00 2001
From: Sean Parkinson <sean@wolfssl.com>
Date: Mon, 12 Dec 2022 12:07:39 +1000
Subject: [PATCH 1/2] API test: Report time taken to perform test

API test now displays timing taken to perform a test case to help
identify ones that are doing too much work.
---
 tests/api.c | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/tests/api.c b/tests/api.c
index 4c0ca5843..67bbe0406 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -60429,10 +60429,23 @@ static const char* apitest_res_string(int res)
     return str;
 }
 
+#ifndef WOLFSSL_UNIT_TEST_NO_TIMING
+static double gettime_secs(void)
+{
+    struct timeval tv;
+    LIBCALL_CHECK_RET(gettimeofday(&tv, 0));
+
+    return (double)tv.tv_sec + (double)tv.tv_usec / 1000000;
+}
+#endif
+
 void ApiTest(void)
 {
     int i;
     int ret;
+#ifndef WOLFSSL_UNIT_TEST_NO_TIMING
+    double timeDiff;
+#endif
 
     printf(" Begin API Tests\n");
     fflush(stdout);
@@ -60445,10 +60458,24 @@ void ApiTest(void)
 
         TestSetup();
 
-        printf("   %3d: %-60s:", i + 1, testCases[i].name);
+        printf("   %3d: %-52s:", i + 1, testCases[i].name);
         fflush(stdout);
+    #ifndef WOLFSSL_UNIT_TEST_NO_TIMING
+        timeDiff = gettime_secs();
+    #endif
         ret = testCases[i].func();
-        printf(" %s\n", apitest_res_string(ret));
+    #ifndef WOLFSSL_UNIT_TEST_NO_TIMING
+        timeDiff = gettime_secs() - timeDiff;
+    #endif
+    #ifndef WOLFSSL_UNIT_TEST_NO_TIMING
+        if (ret != TEST_SKIPPED) {
+            printf(" %s (%9.5lf)\n", apitest_res_string(ret), timeDiff);
+        }
+        else
+    #endif
+        {
+            printf(" %s\n", apitest_res_string(ret));
+        }
         fflush(stdout);
         AssertIntNE(ret, TEST_FAIL);
 

From f87859a00e5f260fbba8da90a0ad5c1c4badf27c Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Mon, 12 Dec 2022 08:56:51 -0800
Subject: [PATCH 2/2] Whitespace cleanups. Use `const` for
 `test_tls_ext_duplicate`.

---
 tests/api.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/api.c b/tests/api.c
index 67bbe0406..1b24f23a5 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -9173,7 +9173,7 @@ static int test_tls_ext_duplicate(void)
 {
     int res = TEST_SKIPPED;
 #if !defined(NO_WOLFSSL_SERVER) && (!defined(NO_RSA) || defined(HAVE_ECC))
-    static unsigned char clientHelloDupTlsExt[] = {
+    const unsigned char clientHelloDupTlsExt[] = {
         0x16, 0x03, 0x03, 0x00, 0x6a, 0x01, 0x00, 0x00,
         0x66, 0x03, 0x03, 0xf4, 0x65, 0xbd, 0x22, 0xfe,
         0x6e, 0xab, 0x66, 0xdd, 0xcf, 0xe9, 0x65, 0x55,
@@ -9192,8 +9192,6 @@ static int test_tls_ext_duplicate(void)
         /* Supported Versions extension for TLS 1.3. */
                                             0x00, 0x2b,
         0x00, 0x05, 0x04, 0x03, 0x04, 0x03, 0x03
-        
-
     };
     WOLFSSL_BUFFER_INFO msg;
     const char* testCertFile;
@@ -9225,7 +9223,7 @@ static int test_tls_ext_duplicate(void)
     ssl = wolfSSL_new(ctx);
     AssertNotNull(ssl);
 
-    msg.buffer = clientHelloDupTlsExt;
+    msg.buffer = (unsigned char*)clientHelloDupTlsExt;
     msg.length = (unsigned int)sizeof(clientHelloDupTlsExt);
     wolfSSL_SetIOReadCtx(ssl, &msg);