From 5845482fc073b0f0d2572394b2eb88b30126c461 Mon Sep 17 00:00:00 2001
From: Sean Parkinson <sean@wolfssl.com>
Date: Tue, 1 May 2018 14:27:38 +1000
Subject: [PATCH] Fixes for tests

Fix the benchmark client to set all groups supported.
Fix TLS 1.3 test script to work on PPC - check counter in separate test.
---
 examples/client/client.c | 18 +++++++++---------
 scripts/tls13.test       | 13 ++++++++-----
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/examples/client/client.c b/examples/client/client.c
index cc1c69a65..d22d6a910 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -192,43 +192,43 @@ static void ShowVersions(void)
 #ifdef WOLFSSL_TLS13
 static void SetKeyShare(WOLFSSL* ssl, int onlyKeyShare, int useX25519)
 {
+    int groups[3];
+    int count = 0;
+
     (void)useX25519;
 
     WOLFSSL_START(WC_FUNC_CLIENT_KEY_EXCHANGE_SEND);
     if (onlyKeyShare == 0 || onlyKeyShare == 2) {
     #ifdef HAVE_CURVE25519
         if (useX25519) {
-            int groups[1] = { WOLFSSL_ECC_X25519 };
+            groups[count++] = WOLFSSL_ECC_X25519;
             if (wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_X25519) != WOLFSSL_SUCCESS)
                 err_sys("unable to use curve x25519");
-            if (wolfSSL_set_groups(ssl, groups, 1) != WOLFSSL_SUCCESS)
-                err_sys("unable to set groups: x25519");
         }
         else
     #endif
         {
     #ifdef HAVE_ECC
         #if defined(HAVE_ECC256) || defined(HAVE_ALL_CURVES)
-            int groups[1] = { WOLFSSL_ECC_SECP256R1 };
+            groups[count++] = WOLFSSL_ECC_SECP256R1;
             if (wolfSSL_UseKeyShare(ssl, WOLFSSL_ECC_SECP256R1)
                                                            != WOLFSSL_SUCCESS) {
                 err_sys("unable to use curve secp256r1");
             }
-            if (wolfSSL_set_groups(ssl, groups, 1) != WOLFSSL_SUCCESS)
-                err_sys("unable to set groups: secp256r1");
         #endif
     #endif
         }
     }
     if (onlyKeyShare == 0 || onlyKeyShare == 1) {
     #ifdef HAVE_FFDHE_2048
-        int groups[1] = { WOLFSSL_FFDHE_2048 };
+        groups[count++] = WOLFSSL_FFDHE_2048;
         if (wolfSSL_UseKeyShare(ssl, WOLFSSL_FFDHE_2048) != WOLFSSL_SUCCESS)
             err_sys("unable to use DH 2048-bit parameters");
-        if (wolfSSL_set_groups(ssl, groups, 1) != WOLFSSL_SUCCESS)
-            err_sys("unable to set groups: DH 2048-bit");
     #endif
     }
+
+    if (wolfSSL_set_groups(ssl, groups, count) != WOLFSSL_SUCCESS)
+        err_sys("unable to set groups");
     WOLFSSL_END(WC_FUNC_CLIENT_KEY_EXCHANGE_SEND);
 }
 #endif
diff --git a/scripts/tls13.test b/scripts/tls13.test
index 847b2626f..368256963 100755
--- a/scripts/tls13.test
+++ b/scripts/tls13.test
@@ -13,18 +13,21 @@ counter=0
 # let's use absolute path to a local dir (make distcheck may be in sub dir)
 # also let's add some randomness by adding pid in case multiple 'make check's
 # per source tree
-ready_file=`pwd`/wolfssl_psk_ready$$
+ready_file=`pwd`/wolfssl_tls13_ready$$
 
 echo "ready file $ready_file"
 
 create_port() {
-    while [ ! -s $ready_file -a "$counter" -lt 50 ]; do
+    while [ ! -s $ready_file ]; do
+        if [ -a "$counter" -gt 50 ]; then
+            break
+        fi
         echo -e "waiting for ready file..."
         sleep 0.1
         counter=$((counter+ 1))
     done
 
-    if test -e $ready_file; then
+    if [ -e $ready_file ]; then
         echo -e "found ready file, starting client..."
 
         # get created port 0 ephemeral port
@@ -36,9 +39,9 @@ create_port() {
 }
 
 remove_ready_file() {
-    if test -e $ready_file; then
+    if [ -e $ready_file ]; then
         echo -e "removing existing ready file"
-    rm $ready_file
+        rm $ready_file
     fi
 }