From a093b632b2c29a698818b1cb8167436453ae18d0 Mon Sep 17 00:00:00 2001
From: Dimitri Papadopoulos
 <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
Date: Sat, 31 Jul 2021 13:19:27 +0200
Subject: [PATCH] Remove spurious trailing space

Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
---
 tests/auth-certificate         | 4 ++--
 tests/auth-hwtpm               | 2 +-
 tests/auth-nonascii            | 2 +-
 tests/auth-pkcs11              | 2 +-
 tests/auth-swtpm               | 2 +-
 tests/auth-username-pass       | 2 +-
 tests/cert-fingerprint         | 2 +-
 tests/dtls-psk                 | 2 +-
 tests/f5-auth-and-config       | 2 +-
 tests/fortinet-auth-and-config | 2 +-
 tests/gp-auth-and-config       | 2 +-
 tests/id-test                  | 2 +-
 tests/juniper-auth             | 2 +-
 tests/juniper-sso-auth         | 2 +-
 tests/obsolete-server-crypto   | 2 +-
 tests/pfs                      | 2 +-
 tests/ppp-over-tls             | 2 +-
 tests/sigterm                  | 2 +-
 18 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/tests/auth-certificate b/tests/auth-certificate
index 7cd2785e..773970be 100755
--- a/tests/auth-certificate
+++ b/tests/auth-certificate
@@ -27,7 +27,7 @@ top_builddir=${top_builddir:-..}
 
 key_list=${key_list:-`echo ${certdir}/*-key-*.{pem,der,p12}`}
 
-echo "Testing certificate auth... "
+echo "Testing certificate auth..."
 
 launch_simple_sr_server -d 1 -f -c configs/test-user-cert.config
 PID=$!
@@ -38,7 +38,7 @@ for KEY in ${key_list}; do
     if [ "${KEY%%.p12}" != "${KEY}" ]; then
 	CERTARGS="-c ${KEY} --key-password password"
     else
-	CERTARGS="--sslkey ${KEY} --key-password password -c ${KEY%-key-*}-cert.pem "
+	CERTARGS="--sslkey ${KEY} --key-password password -c ${KEY%-key-*}-cert.pem"
     fi
     ( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS:443 -u test $CERTARGS --servercert=d66b507ae074d03b02eafca40d35f87dd81049d3 --cookieonly --passwd-on-stdin ) ||
 	fail $PID "Could not connect with key ${KEY##*/}!"
diff --git a/tests/auth-hwtpm b/tests/auth-hwtpm
index bc30b60c..3b4b04b3 100755
--- a/tests/auth-hwtpm
+++ b/tests/auth-hwtpm
@@ -27,7 +27,7 @@ top_builddir=${top_builddir:-..}
 
 hwtpm_list=${hwtpm_list:-`echo ${certdir}/swtpm*-key-tpm.pem`}
 
-echo "Testing TPMv2 auth with hwtpm... "
+echo "Testing TPMv2 auth with hwtpm..."
 
 launch_simple_sr_server -d 1 -f -c configs/test-user-cert.config
 PID=$!
diff --git a/tests/auth-nonascii b/tests/auth-nonascii
index 70a2dcc2..127b41e8 100755
--- a/tests/auth-nonascii
+++ b/tests/auth-nonascii
@@ -25,7 +25,7 @@ top_builddir=${top_builddir:-..}
 
 . `dirname $0`/common.sh
 
-echo "Testing certificate auth with non-ASCII passwords... "
+echo "Testing certificate auth with non-ASCII passwords..."
 
 launch_simple_sr_server -d 1 -f -c configs/test-user-cert.config
 PID=$!
diff --git a/tests/auth-pkcs11 b/tests/auth-pkcs11
index dba10fa2..63686928 100755
--- a/tests/auth-pkcs11
+++ b/tests/auth-pkcs11
@@ -28,7 +28,7 @@ top_builddir=${top_builddir:-..}
 pkcs11_keys=${pkcs11_keys:-object=RSA object=DSA object=EC id=%01 id=%02 id=%03}
 pkcs11_tokens=${pkcs11_tokens:-openconnect-test}
 
-echo "Testing PKCS#11 auth... "
+echo "Testing PKCS#11 auth..."
 
 launch_simple_sr_server -d 1 -f -c configs/test-user-cert.config
 PID=$!
diff --git a/tests/auth-swtpm b/tests/auth-swtpm
index be6d9150..d1b806c6 100755
--- a/tests/auth-swtpm
+++ b/tests/auth-swtpm
@@ -27,7 +27,7 @@ top_builddir=${top_builddir:-..}
 
 swtpm_list=${swtpm_list:-`echo ${certdir}/swtpm*-key-tpm.pem`}
 
-echo "Testing TPMv2 auth with swtpm... "
+echo "Testing TPMv2 auth with swtpm..."
 
 launch_simple_sr_server -d 1 -f -c configs/test-user-cert.config
 PID=$!
diff --git a/tests/auth-username-pass b/tests/auth-username-pass
index 89ecc545..ca42d0a9 100755
--- a/tests/auth-username-pass
+++ b/tests/auth-username-pass
@@ -25,7 +25,7 @@ top_builddir=${top_builddir:-..}
 
 . `dirname $0`/common.sh
 
-echo "Testing certificate auth... "
+echo "Testing certificate auth..."
 
 launch_simple_sr_server -d 1 -f -c configs/test-user-pass.config
 PID=$!
diff --git a/tests/cert-fingerprint b/tests/cert-fingerprint
index 2e6b95a3..c218611b 100755
--- a/tests/cert-fingerprint
+++ b/tests/cert-fingerprint
@@ -25,7 +25,7 @@ top_builddir=${top_builddir:-..}
 
 . `dirname $0`/common.sh
 
-echo "Testing certificate auth... "
+echo "Testing certificate auth..."
 
 launch_simple_sr_server -d 1 -f -c configs/test-user-pass.config
 PID=$!
diff --git a/tests/dtls-psk b/tests/dtls-psk
index dd7eb1fb..1b61c379 100755
--- a/tests/dtls-psk
+++ b/tests/dtls-psk
@@ -42,7 +42,7 @@ if test "$(id -u)" != "0";then
 	exit 77
 fi
 
-echo "Testing ocserv connection with DTLS-PSK... "
+echo "Testing ocserv connection with DTLS-PSK..."
 
 function finish {
   set +e
diff --git a/tests/f5-auth-and-config b/tests/f5-auth-and-config
index d6918305..52e743dd 100755
--- a/tests/f5-auth-and-config
+++ b/tests/f5-auth-and-config
@@ -28,7 +28,7 @@ FINGERPRINT="--servercert=d66b507ae074d03b02eafca40d35f87dd81049d3"
 CERT=$certdir/server-cert.pem
 KEY=$certdir/server-key.pem
 
-echo "Testing F5 auth against fake server ... "
+echo "Testing F5 auth against fake server ..."
 
 OCSERV=${srcdir}/fake-f5-server.py
 launch_simple_sr_server $ADDRESS 443 $CERT $KEY > /dev/null 2>&1
diff --git a/tests/fortinet-auth-and-config b/tests/fortinet-auth-and-config
index 2918cdbe..2ce3518b 100755
--- a/tests/fortinet-auth-and-config
+++ b/tests/fortinet-auth-and-config
@@ -28,7 +28,7 @@ FINGERPRINT="--servercert=d66b507ae074d03b02eafca40d35f87dd81049d3"
 CERT=$certdir/server-cert.pem
 KEY=$certdir/server-key.pem
 
-echo "Testing Fortinet auth against fake server ... "
+echo "Testing Fortinet auth against fake server ..."
 
 OCSERV=${srcdir}/fake-fortinet-server.py
 launch_simple_sr_server $ADDRESS 443 $CERT $KEY > /dev/null 2>&1
diff --git a/tests/gp-auth-and-config b/tests/gp-auth-and-config
index 2ddef59f..2537321f 100755
--- a/tests/gp-auth-and-config
+++ b/tests/gp-auth-and-config
@@ -28,7 +28,7 @@ FINGERPRINT="--servercert=d66b507ae074d03b02eafca40d35f87dd81049d3"
 CERT=$certdir/server-cert.pem
 KEY=$certdir/server-key.pem
 
-echo "Testing GlobalProtect auth against fake server ... "
+echo "Testing GlobalProtect auth against fake server ..."
 
 OCSERV=${srcdir}/fake-gp-server.py
 launch_simple_sr_server $ADDRESS 443 $CERT $KEY >/dev/null 2>&1
diff --git a/tests/id-test b/tests/id-test
index 71b8a11d..6f42f491 100755
--- a/tests/id-test
+++ b/tests/id-test
@@ -25,7 +25,7 @@ top_builddir=${top_builddir:-..}
 
 . `dirname $0`/common.sh
 
-echo "Testing certificate auth... "
+echo "Testing certificate auth..."
 
 launch_simple_sr_server -d 1 -f -c configs/test-user-pass.config >/dev/null 2>&1
 PID=$!
diff --git a/tests/juniper-auth b/tests/juniper-auth
index 5e1cb5e5..32367074 100755
--- a/tests/juniper-auth
+++ b/tests/juniper-auth
@@ -29,7 +29,7 @@ CERT=$certdir/server-cert.pem
 KEY=$certdir/server-key.pem
 FAKE_TOKEN="--token-mode=totp --token-secret=ABCD"
 
-echo "Testing Juniper auth against fake server ... "
+echo "Testing Juniper auth against fake server ..."
 
 OCSERV=${srcdir}/fake-juniper-server.py
 launch_simple_sr_server $ADDRESS 443 $CERT $KEY > /dev/null 2>&1
diff --git a/tests/juniper-sso-auth b/tests/juniper-sso-auth
index c4464f84..795b9824 100755
--- a/tests/juniper-sso-auth
+++ b/tests/juniper-sso-auth
@@ -29,7 +29,7 @@ CERT=$certdir/server-cert.pem
 KEY=$certdir/server-key.pem
 FAKE_TOKEN="--token-mode=totp --token-secret=ABCD"
 
-echo "Testing Juniper SSO auth against fake server ... "
+echo "Testing Juniper SSO auth against fake server ..."
 
 ${srcdir}/fake-juniper-sso-server.py $ADDRESS 1443 $CERT $KEY >/dev/null 2>&1 &
 PID=$!
diff --git a/tests/obsolete-server-crypto b/tests/obsolete-server-crypto
index 90d93ef6..9071ab82 100755
--- a/tests/obsolete-server-crypto
+++ b/tests/obsolete-server-crypto
@@ -30,7 +30,7 @@ top_builddir=${top_builddir:-..}
 # crypto UNLESS --allow-insecure-crypto is specified.
 ########################################
 
-echo "Testing against server with insecure crypto (3DES and RC4 only)... "
+echo "Testing against server with insecure crypto (3DES and RC4 only)..."
 
 # Run servers
 PORT=4568
diff --git a/tests/pfs b/tests/pfs
index 0608bb29..e57f1d71 100755
--- a/tests/pfs
+++ b/tests/pfs
@@ -31,7 +31,7 @@ top_builddir=${top_builddir:-..}
 # CAN connect if it is not specified.
 ########################################
 
-echo "Testing against server without PFS... "
+echo "Testing against server without PFS..."
 
 # Need to disable TLS 1.3 here because GnuTLS v3.6.13 is allowing non-RSA KX with TLS 1.3, even with -KX-ALL
 # But can't use -VERS-TLS1.3 here, because it's not known to earlier versions of GnuTLS.
diff --git a/tests/ppp-over-tls b/tests/ppp-over-tls
index a0f316af..8c2e31e0 100755
--- a/tests/ppp-over-tls
+++ b/tests/ppp-over-tls
@@ -45,7 +45,7 @@ IPV6_SUCCESS_1="rcvd [IPV6CP ConfAck "
 IPV6_SUCCESS_2="sent [IPV6CP ConfAck "
 TIMEOUT_3S_IDLE="idle 3"
 
-echo "Testing PPP with 'HDLC-like framing' (RFC1662)... "
+echo "Testing PPP with 'HDLC-like framing' (RFC1662)..."
 
 echo -n "Starting PPP peer (HDLC/RFC1662, IPv4+IPv6, DNS, extraneous VJ and CCP)... "
 start=$(date +%s)
diff --git a/tests/sigterm b/tests/sigterm
index 403dd0bb..d653a414 100755
--- a/tests/sigterm
+++ b/tests/sigterm
@@ -45,7 +45,7 @@ if test "$(id -u)" != "0";then
 	exit 77
 fi
 
-echo "Testing ocserv connection with DTLS-PSK... "
+echo "Testing ocserv connection with DTLS-PSK..."
 
 function finish {
   set +e
-- 
2.50.1