From 60f8eaa3b40964e3dfd1146efa0ed8049f61fdbb Mon Sep 17 00:00:00 2001
From: Yanray Wang <yanray.wang@arm.com>
Date: Fri, 20 Jan 2023 12:45:13 +0800
Subject: [PATCH] Remove third argument passed to run_client in compat.sh

The argument passed to translate_ciphers.py is calculated from $1 in
run_client instead of passed as third argument.

Signed-off-by: Yanray Wang <yanray.wang@arm.com>
---
 tests/compat.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/compat.sh b/tests/compat.sh
index 886ad8f651..2a93efc255 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -800,8 +800,11 @@ run_client() {
     LEN=$(( 72 - `echo "$TITLE" | wc -c` ))
     for i in `seq 1 $LEN`; do printf '.'; done; printf ' '
 
+    # Calculate the argument $c to pass to translate_ciphers.py
+    client=$(echo $1 | head -c1)
+    c=$(echo $client | tr '[:upper:]' '[:lower:]')
     # Translate ciphersuite names based on client's naming convention
-    t_cipher=$(./scripts/translate_ciphers.py $3 $2)
+    t_cipher=$(./scripts/translate_ciphers.py $c $2)
     check_translation $? "$t_cipher"
 
     # should we skip?
@@ -1027,7 +1030,7 @@ for VERIFY in $VERIFIES; do
                         start_server "OpenSSL"
                         for i in $M_CIPHERS; do
                             check_openssl_server_bug $i
-                            run_client mbedTLS $i m
+                            run_client mbedTLS $i
                         done
                         stop_server
                     fi
@@ -1035,7 +1038,7 @@ for VERIFY in $VERIFIES; do
                     if [ "X" != "X$O_CIPHERS" ]; then
                         start_server "mbedTLS"
                         for i in $O_CIPHERS; do
-                            run_client OpenSSL $i o
+                            run_client OpenSSL $i
                         done
                         stop_server
                     fi
@@ -1052,7 +1055,7 @@ for VERIFY in $VERIFIES; do
                     if [ "X" != "X$M_CIPHERS" ]; then
                         start_server "GnuTLS"
                         for i in $M_CIPHERS; do
-                            run_client mbedTLS $i m
+                            run_client mbedTLS $i
                         done
                         stop_server
                     fi
@@ -1060,7 +1063,7 @@ for VERIFY in $VERIFIES; do
                     if [ "X" != "X$G_CIPHERS" ]; then
                         start_server "mbedTLS"
                         for i in $G_CIPHERS; do
-                            run_client GnuTLS $i g
+                            run_client GnuTLS $i
                         done
                         stop_server
                     fi
@@ -1079,7 +1082,7 @@ for VERIFY in $VERIFIES; do
                     if [ "X" != "X$M_CIPHERS" ]; then
                         start_server "mbedTLS"
                         for i in $M_CIPHERS; do
-                            run_client mbedTLS $i m
+                            run_client mbedTLS $i
                         done
                         stop_server
                     fi