tests: tab indent + minor style changes

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>

1 files changed, 345 insertions, 317 deletions

diff --git a/tests/suite/testcompat-main-polarssl b/tests/suite/testcompat-main-polarssl
index 74261b0802..bf49918cac 100755
--- a/tests/suite/testcompat-main-polarssl
+++ b/tests/suite/testcompat-main-polarssl
@@ -34,44 +34,44 @@ srcdir="${srcdir:-.}"
 CLI="${CLI:-../../src/gnutls-cli${EXEEXT}}"
 LOGFILE=polarssl.log
 unset RETCODE
-if ! test -z "${VALGRIND}";then
-  VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}"
+if ! test -z "${VALGRIND}"; then
+	VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}"
 fi
 
-if test "${WINDIR}" != "";then
-  exit 77
+if test "${WINDIR}" != ""; then
+	exit 77
 fi
 
 . "${srcdir}/../scripts/common.sh"
 
 PORT="${PORT:-${RPORT}}"
 TXT=`"${CLI}" --priority NORMAL --list|grep SECP224`
-if test -z "${TXT}";then
-  ALL_CURVES=0
+if test -z "${TXT}"; then
+	ALL_CURVES=0
 else
-  ALL_CURVES=1
+	ALL_CURVES=1
 fi
 
 
 echo "Compatibility checks using polarssl"
 
 for POLARSSL_CLI in \
-    /usr/bin/polarssl_ssl_client2 \
-    /usr/bin/mbedtls_ssl_client2 \
-    /usr/libexec/mbedtls/ssl_client2 \
-    ""; do
-  test -x "${POLARSSL_CLI}" && break
+		/usr/bin/polarssl_ssl_client2 \
+		/usr/bin/mbedtls_ssl_client2 \
+		/usr/libexec/mbedtls/ssl_client2 \
+		""; do
+	test -x "${POLARSSL_CLI}" && break
 done
 
-if test -z "${POLARSSL_CLI}";then
-  echo "PolarSSL is required for this test to run"
-  exit 77
+if test -z "${POLARSSL_CLI}"; then
+	echo "PolarSSL is required for this test to run"
+	exit 77
 fi
 
 "${POLARSSL_CLI}" >/dev/null 2>&1
-if test $? = 0;then
-  echo "PolarSSL 1.3.x is required for the tests to run"
-  exit 77
+if test $? = 0; then
+	echo "PolarSSL 1.3.x is required for the tests to run"
+	exit 77
 fi
 
 
@@ -85,330 +85,358 @@ SERV="../../src/gnutls-serv${EXEEXT} -q"
 
 rm -f "${LOGFILE}"
 
-for ADD in "" ":%COMPAT" ":%NO_ETM" #":%NO_TICKETS" ":%DISABLE_SAFE_RENEGOTIATION"
-do
-  if ! test -z "${ADD}";then
-    echo ""
-    echo "** Modifier: ${ADD}"
-  fi
+for ADD in "" ":%COMPAT" ":%NO_ETM"; do #":%NO_TICKETS" ":%DISABLE_SAFE_RENEGOTIATION"
+	if ! test -z "${ADD}"; then
+		echo ""
+		echo "** Modifier: ${ADD}"
+	fi
 
-  # SSL 3.0 is disabled in debian's polarssl
-  if test 0 = 1;then
-    echo "Check SSL 3.0 with RSA ciphersuite"
-    launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-SSL3.0:+RSA${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${srcdir}/params.dh"  & PID=$!
-    wait_server ${PID}
+	# SSL 3.0 is disabled in debian's polarssl
+	if test 0 = 1; then
+		echo "Check SSL 3.0 with RSA ciphersuite"
+		launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-SSL3.0:+RSA${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${srcdir}/params.dh"  &
+		PID=$!
+		wait_server ${PID}
 
-    "${POLARSSL_CLI}" server_port="${PORT}" server_name=localhost max_version=ssl3 crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-      fail ${PID} "Failed"
+		"${POLARSSL_CLI}" server_port="${PORT}" server_name=localhost max_version=ssl3 crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+			fail ${PID} "Failed"
 
-    kill ${PID}
-    wait
+		kill ${PID}
+		wait
+
+		echo "Check SSL 3.0 with DHE-RSA ciphersuite"
+		launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-SSL3.0:+DHE-RSA${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${srcdir}/params.dh"  &
+		PID=$!
+		wait_server ${PID}
 
-    echo "Check SSL 3.0 with DHE-RSA ciphersuite"
-    launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-SSL3.0:+DHE-RSA${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${srcdir}/params.dh"  & PID=$!
-    wait_server ${PID}
+		"${POLARSSL_CLI}" server_name=localhost server_port="${PORT}" max_version=ssl3 crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+			fail ${PID} "Failed"
 
-    "${POLARSSL_CLI}" server_name=localhost server_port="${PORT}" max_version=ssl3 crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-      fail ${PID} "Failed"
+		kill ${PID}
+		wait
 
-    kill ${PID}
-    wait
+		# No DSS for polarssl
+		#echo "Check SSL 3.0 with DHE-DSS ciphersuite"
+		#launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-SSL3.0:+DHE-DSS" --x509certfile "${SERV_DSA_CERT}" --x509keyfile "${SERV_DSA_KEY}" --dhparams "${srcdir}/params.dh"  &
+		#PID=$!
+		#wait_server ${PID}
+
+		#"${POLARSSL_CLI}" server_name=localhost server_port="${PORT}" max_version=ssl3 crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		#  fail ${PID} "Failed"
+		#
+		#kill ${PID}
+		#wait
+	fi
+
+	#TLS 1.0
+
+	echo "Check TLS 1.0 with DHE-RSA ciphersuite"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+DHE-RSA${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${srcdir}/params.dh"  &
+	PID=$!
+	wait_server ${PID}
 
-    # No DSS for polarssl
-    #echo "Check SSL 3.0 with DHE-DSS ciphersuite"
-    #launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-SSL3.0:+DHE-DSS" --x509certfile "${SERV_DSA_CERT}" --x509keyfile "${SERV_DSA_KEY}" --dhparams "${srcdir}/params.dh"  & PID=$!
-    #wait_server ${PID}
+	"${POLARSSL_CLI}"  server_name=localhost min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
 
-    #"${POLARSSL_CLI}" server_name=localhost server_port="${PORT}" max_version=ssl3 crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    #  fail ${PID} "Failed"
-    #
-    #kill ${PID}
-    #wait
-  fi
+	kill ${PID}
+	wait
+
+	#echo "Check TLS 1.0 with DHE-DSS ciphersuite"
+	#launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+DHE-DSS${ADD}" --x509certfile "${SERV_DSA_CERT}" --x509keyfile "${SERV_DSA_KEY}" --dhparams "${srcdir}/params.dh"  &
+	#PID=$!
+	#wait_server ${PID}
+
+	#"${POLARSSL_CLI}"  server_name=localhost min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+	#  fail ${PID} "Failed"
+
+	#kill ${PID}
+	#wait
+
+	echo "Check TLS 1.0 with ECDHE-RSA ciphersuite"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+ECDHE-RSA:+CURVE-ALL${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" &
+	PID=$!
+	wait_server ${PID}
+
+	#-cipher ECDHE-RSA-AES128-SHA
+	"${POLARSSL_CLI}"  server_name=localhost min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	echo "Check TLS 1.0 with PSK ciphersuite"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+PSK:+CURVE-ALL${ADD}" --pskpasswd "${SERV_PSK}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" &
+	PID=$!
+	wait_server ${PID}
+
+	#-cipher PSK-AES128-SHA
+	"${POLARSSL_CLI}"  server_name=localhost psk_identity=jas psk=9e32cf7786321a828ef7668f09fb35db min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
 
-  #TLS 1.0
+	kill ${PID}
+	wait
+
+	echo "Check TLS 1.0 with DHE-PSK ciphersuite"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+DHE-PSK:+CURVE-ALL${ADD}" --pskpasswd "${SERV_PSK}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" &
+	PID=$!
+	wait_server ${PID}
 
-  echo "Check TLS 1.0 with DHE-RSA ciphersuite"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+DHE-RSA${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${srcdir}/params.dh"  & PID=$!
-  wait_server ${PID}
+	#-cipher PSK-AES128-SHA
+	"${POLARSSL_CLI}"  server_name=localhost psk_identity=jas psk=9e32cf7786321a828ef7668f09fb35db min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
 
-  "${POLARSSL_CLI}"  server_name=localhost min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
+	kill ${PID}
+	wait
+
+	echo "Check TLS 1.0 with ECDHE-PSK ciphersuite"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+ECDHE-PSK:+CURVE-ALL${ADD}" --pskpasswd "${SERV_PSK}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" &
+	PID=$!
+	wait_server ${PID}
 
-  kill ${PID}
-  wait
+	#-cipher PSK-AES128-SHA
+	"${POLARSSL_CLI}"  server_name=localhost psk_identity=jas psk=9e32cf7786321a828ef7668f09fb35db min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
 
-  #echo "Check TLS 1.0 with DHE-DSS ciphersuite"
-  #launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+DHE-DSS${ADD}" --x509certfile "${SERV_DSA_CERT}" --x509keyfile "${SERV_DSA_KEY}" --dhparams "${srcdir}/params.dh"  & PID=$!
-  #wait_server ${PID}
+	kill ${PID}
+	wait
 
-  #"${POLARSSL_CLI}"  server_name=localhost min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-  #  fail ${PID} "Failed"
+	echo "Check TLS 1.0 with RSA-PSK ciphersuite"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+RSA-PSK:+CURVE-ALL${ADD}" --pskpasswd "${SERV_PSK}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" &
+	PID=$!
+	wait_server ${PID}
 
-  #kill ${PID}
-  #wait
+	#-cipher RSA-PSK-AES128-SHA
+	"${POLARSSL_CLI}"  server_name=localhost psk_identity=jas psk=9e32cf7786321a828ef7668f09fb35db min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
 
-  echo "Check TLS 1.0 with ECDHE-RSA ciphersuite"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+ECDHE-RSA:+CURVE-ALL${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" & PID=$!
-  wait_server ${PID}
+	kill ${PID}
+	wait
 
-  #-cipher ECDHE-RSA-AES128-SHA
-  "${POLARSSL_CLI}"  server_name=localhost min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
+	if test ${ALL_CURVES} = 1; then
+		echo "Check TLS 1.0 with ECDHE-ECDSA ciphersuite (SECP224R1)"
+		launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+ECDHE-ECDSA:+CURVE-ALL${ADD}" --x509certfile "${ECC224_CERT}" --x509keyfile "${ECC224_KEY}" --x509cafile "${CA_ECC_CERT}" &
+		PID=$!
+		wait_server ${PID}
 
-  kill ${PID}
-  wait
+		#-cipher ECDHE-ECDSA-AES128-SHA
+		"${POLARSSL_CLI}"  server_name=localhost min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${ECC224_CERT}" key_file="${ECC224_KEY}" ca_file="${CA_ECC_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+			fail ${PID} "Failed"
 
-  echo "Check TLS 1.0 with PSK ciphersuite"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+PSK:+CURVE-ALL${ADD}" --pskpasswd "${SERV_PSK}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" & PID=$!
-  wait_server ${PID}
+		kill ${PID}
+		wait
+	fi
 
-  #-cipher PSK-AES128-SHA
-  "${POLARSSL_CLI}"  server_name=localhost psk_identity=jas psk=9e32cf7786321a828ef7668f09fb35db min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
+	echo "Check TLS 1.0 with ECDHE-ECDSA ciphersuite (SECP256R1)"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+ECDHE-ECDSA:+CURVE-ALL${ADD}" --x509certfile "${ECC256_CERT}" --x509keyfile "${ECC256_KEY}" --x509cafile "${CA_ECC_CERT}" &
+	PID=$!
+	wait_server ${PID}
+
+	#-cipher ECDHE-ECDSA-AES128-SHA
+	"${POLARSSL_CLI}"  server_name=localhost min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${ECC256_CERT}" key_file="${ECC256_KEY}" ca_file="${CA_ECC_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
 
-  kill ${PID}
-  wait
+	kill ${PID}
+	wait
 
-  echo "Check TLS 1.0 with DHE-PSK ciphersuite"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+DHE-PSK:+CURVE-ALL${ADD}" --pskpasswd "${SERV_PSK}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" & PID=$!
-  wait_server ${PID}
+	echo "Check TLS 1.0 with ECDHE-ECDSA ciphersuite (SECP384R1)"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+ECDHE-ECDSA:+CURVE-ALL${ADD}" --x509certfile "${ECC384_CERT}" --x509keyfile "${ECC384_KEY}" --x509cafile "${CA_ECC_CERT}" &
+	PID=$!
+	wait_server ${PID}
+
+	#-cipher ECDHE-ECDSA-AES128-SHA
+	"${POLARSSL_CLI}"  server_name=localhost min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${ECC384_CERT}" key_file="${ECC384_KEY}" ca_file="${CA_ECC_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	echo "Check TLS 1.0 with ECDHE-ECDSA ciphersuite (SECP521R1)"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+ECDHE-ECDSA:+CURVE-ALL${ADD}" --x509certfile "${ECC521_CERT}" --x509keyfile "${ECC521_KEY}" --x509cafile "${CA_ECC_CERT}" &
+	PID=$!
+	wait_server ${PID}
+
+	#-cipher ECDHE-ECDSA-AES128-SHA
+	"${POLARSSL_CLI}"  server_name=localhost min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${ECC521_CERT}" key_file="${ECC521_KEY}" ca_file="${CA_ECC_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	echo "Check TLS 1.2 with DHE-RSA ciphersuite"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+DHE-RSA${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${srcdir}/params.dh"  &
+	PID=$!
+	wait_server ${PID}
+
+	"${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	echo "Check TLS 1.2 with CAMELLIA-128-GCM-DHE-RSA ciphersuite"
+	launch_server $$  --priority "NONE:-CIPHER-ALL:+CAMELLIA-128-GCM:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+DHE-RSA${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${srcdir}/params.dh"  &
+	PID=$!
+	wait_server ${PID}
+
+	"${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	echo "Check TLS 1.2 with CAMELLIA-256-GCM-DHE-RSA ciphersuite"
+	launch_server $$  --priority "NONE:-CIPHER-ALL:+CAMELLIA-256-GCM:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+DHE-RSA${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${srcdir}/params.dh"  &
+	PID=$!
+	wait_server ${PID}
+
+	"${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	echo "Check TLS 1.2 with AES-128-CCM-DHE-RSA ciphersuite"
+	launch_server $$  --priority "NONE:-CIPHER-ALL:+AES-128-CCM:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+DHE-RSA${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${srcdir}/params.dh"  &
+	PID=$!
+	wait_server ${PID}
+
+	"${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	echo "Check TLS 1.2 with AES-128-CCM-8-DHE-RSA ciphersuite"
+	launch_server $$  --priority "NONE:-CIPHER-ALL:+AES-128-CCM-8:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+DHE-RSA${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${srcdir}/params.dh"  &
+	PID=$!
+	wait_server ${PID}
+
+	"${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	#echo "Check TLS 1.2 with DHE-DSS ciphersuite"
+	#launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+DHE-DSS${ADD}" --x509certfile "${SERV_DSA_CERT}" --x509keyfile "${SERV_DSA_KEY}" --dhparams "${srcdir}/params.dh"  &
+	#PID=$!
+	#wait_server ${PID}
+	#
+	#"${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+	#  fail ${PID} "Failed"
+	#
+	#kill ${PID}
+	#wait
+
+	echo "Check TLS 1.2 with ECDHE-RSA ciphersuite"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+ECDHE-RSA:+CURVE-ALL${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" &
+	PID=$!
+	wait_server ${PID}
+
+	#-cipher ECDHE-RSA-AES128-SHA
+	"${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	if test ${ALL_CURVES} = 1; then
+		echo "Check TLS 1.2 with ECDHE-ECDSA ciphersuite (SECP224R1)"
+		launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+ECDHE-ECDSA:+CURVE-ALL${ADD}" --x509certfile "${ECC224_CERT}" --x509keyfile "${ECC224_KEY}" --x509cafile "${CA_ECC_CERT}" &
+		PID=$!
+		wait_server ${PID}
+
+		#-cipher ECDHE-ECDSA-AES128-SHA
+		"${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${ECC224_CERT}" key_file="${ECC224_KEY}" ca_file="${CA_ECC_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+			fail ${PID} "Failed"
+
+		kill ${PID}
+		wait
+	fi
+
+	echo "Check TLS 1.2 with ECDHE-ECDSA ciphersuite (SECP256R1)"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+ECDHE-ECDSA:+CURVE-ALL${ADD}" --x509certfile "${ECC256_CERT}" --x509keyfile "${ECC256_KEY}" --x509cafile "${CA_ECC_CERT}" &
+	PID=$!
+	wait_server ${PID}
 
-  #-cipher PSK-AES128-SHA
-  "${POLARSSL_CLI}"  server_name=localhost psk_identity=jas psk=9e32cf7786321a828ef7668f09fb35db min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
+	#-cipher ECDHE-ECDSA-AES128-SHA
+	"${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${ECC256_CERT}" key_file="${ECC256_KEY}" ca_file="${CA_ECC_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	echo "Check TLS 1.2 with ECDHE-ECDSA ciphersuite (SECP384R1)"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+ECDHE-ECDSA:+CURVE-ALL${ADD}" --x509certfile "${ECC384_CERT}" --x509keyfile "${ECC384_KEY}" --x509cafile "${CA_ECC_CERT}" &
+	PID=$!
+	wait_server ${PID}
+
+	#-cipher ECDHE-ECDSA-AES128-SHA
+	"${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${ECC384_CERT}" key_file="${ECC384_KEY}" ca_file="${CA_ECC_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	echo "Check TLS 1.2 with ECDHE-ECDSA ciphersuite (SECP521R1)"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+ECDHE-ECDSA:+CURVE-ALL${ADD}" --x509certfile "${ECC521_CERT}" --x509keyfile "${ECC521_KEY}" --x509cafile "${CA_ECC_CERT}" &
+	PID=$!
+	wait_server ${PID}
+
+	#-cipher ECDHE-ECDSA-AES128-SHA
+	"${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${ECC521_CERT}" key_file="${ECC521_KEY}" ca_file="${CA_ECC_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	echo "Check TLS 1.2 with PSK ciphersuite"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+PSK:+CURVE-ALL${ADD}" --pskpasswd "${SERV_PSK}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" &
+	PID=$!
+	wait_server ${PID}
+
+	#-cipher PSK-AES128-SHA
+	"${POLARSSL_CLI}"  server_name=localhost psk_identity=jas psk=9e32cf7786321a828ef7668f09fb35db min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	echo "Check TLS 1.2 with DHE-PSK ciphersuite"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+DHE-PSK:+CURVE-ALL${ADD}" --pskpasswd "${SERV_PSK}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" &
+	PID=$!
+	wait_server ${PID}
+
+	#-cipher PSK-AES128-SHA
+	"${POLARSSL_CLI}"  server_name=localhost psk_identity=jas psk=9e32cf7786321a828ef7668f09fb35db min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	echo "Check TLS 1.2 with ECDHE-PSK ciphersuite"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+ECDHE-PSK:+CURVE-ALL${ADD}" --pskpasswd "${SERV_PSK}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" &
+	PID=$!
+	wait_server ${PID}
+
+	#-cipher PSK-AES128-SHA
+	"${POLARSSL_CLI}"  server_name=localhost psk_identity=jas psk=9e32cf7786321a828ef7668f09fb35db min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
+
+	kill ${PID}
+	wait
+
+	echo "Check TLS 1.2 with RSA-PSK ciphersuite"
+	launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+RSA-PSK:+CURVE-ALL${ADD}" --pskpasswd "${SERV_PSK}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" &
+	PID=$!
+	wait_server ${PID}
 
-  kill ${PID}
-  wait
+	#-cipher RSA-PSK-AES128-SHA
+	"${POLARSSL_CLI}"  server_name=localhost psk_identity=jas psk=9e32cf7786321a828ef7668f09fb35db min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
+		fail ${PID} "Failed"
 
-  echo "Check TLS 1.0 with ECDHE-PSK ciphersuite"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+ECDHE-PSK:+CURVE-ALL${ADD}" --pskpasswd "${SERV_PSK}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" & PID=$!
-  wait_server ${PID}
-
-  #-cipher PSK-AES128-SHA
-  "${POLARSSL_CLI}"  server_name=localhost psk_identity=jas psk=9e32cf7786321a828ef7668f09fb35db min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  echo "Check TLS 1.0 with RSA-PSK ciphersuite"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+RSA-PSK:+CURVE-ALL${ADD}" --pskpasswd "${SERV_PSK}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" & PID=$!
-  wait_server ${PID}
-
-  #-cipher RSA-PSK-AES128-SHA
-  "${POLARSSL_CLI}"  server_name=localhost psk_identity=jas psk=9e32cf7786321a828ef7668f09fb35db min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  if test ${ALL_CURVES} = 1;then
-    echo "Check TLS 1.0 with ECDHE-ECDSA ciphersuite (SECP224R1)"
-    launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+ECDHE-ECDSA:+CURVE-ALL${ADD}" --x509certfile "${ECC224_CERT}" --x509keyfile "${ECC224_KEY}" --x509cafile "${CA_ECC_CERT}" & PID=$!
-    wait_server ${PID}
-
-    #-cipher ECDHE-ECDSA-AES128-SHA
-    "${POLARSSL_CLI}"  server_name=localhost min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${ECC224_CERT}" key_file="${ECC224_KEY}" ca_file="${CA_ECC_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-      fail ${PID} "Failed"
-
-    kill ${PID}
-    wait
-  fi
-
-  echo "Check TLS 1.0 with ECDHE-ECDSA ciphersuite (SECP256R1)"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+ECDHE-ECDSA:+CURVE-ALL${ADD}" --x509certfile "${ECC256_CERT}" --x509keyfile "${ECC256_KEY}" --x509cafile "${CA_ECC_CERT}" & PID=$!
-  wait_server ${PID}
-
-  #-cipher ECDHE-ECDSA-AES128-SHA
-  "${POLARSSL_CLI}"  server_name=localhost min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${ECC256_CERT}" key_file="${ECC256_KEY}" ca_file="${CA_ECC_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  echo "Check TLS 1.0 with ECDHE-ECDSA ciphersuite (SECP384R1)"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+ECDHE-ECDSA:+CURVE-ALL${ADD}" --x509certfile "${ECC384_CERT}" --x509keyfile "${ECC384_KEY}" --x509cafile "${CA_ECC_CERT}" & PID=$!
-  wait_server ${PID}
-
-  #-cipher ECDHE-ECDSA-AES128-SHA
-  "${POLARSSL_CLI}"  server_name=localhost min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${ECC384_CERT}" key_file="${ECC384_KEY}" ca_file="${CA_ECC_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  echo "Check TLS 1.0 with ECDHE-ECDSA ciphersuite (SECP521R1)"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.0:+ECDHE-ECDSA:+CURVE-ALL${ADD}" --x509certfile "${ECC521_CERT}" --x509keyfile "${ECC521_KEY}" --x509cafile "${CA_ECC_CERT}" & PID=$!
-  wait_server ${PID}
-
-  #-cipher ECDHE-ECDSA-AES128-SHA
-  "${POLARSSL_CLI}"  server_name=localhost min_version=tls1 max_version=tls1 server_port="${PORT}" crt_file="${ECC521_CERT}" key_file="${ECC521_KEY}" ca_file="${CA_ECC_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  echo "Check TLS 1.2 with DHE-RSA ciphersuite"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+DHE-RSA${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${srcdir}/params.dh"  & PID=$!
-  wait_server ${PID}
-
-  "${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  echo "Check TLS 1.2 with CAMELLIA-128-GCM-DHE-RSA ciphersuite"
-  launch_server $$  --priority "NONE:-CIPHER-ALL:+CAMELLIA-128-GCM:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+DHE-RSA${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${srcdir}/params.dh"  & PID=$!
-  wait_server ${PID}
-
-  "${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  echo "Check TLS 1.2 with CAMELLIA-256-GCM-DHE-RSA ciphersuite"
-  launch_server $$  --priority "NONE:-CIPHER-ALL:+CAMELLIA-256-GCM:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+DHE-RSA${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${srcdir}/params.dh"  & PID=$!
-  wait_server ${PID}
-
-  "${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  echo "Check TLS 1.2 with AES-128-CCM-DHE-RSA ciphersuite"
-  launch_server $$  --priority "NONE:-CIPHER-ALL:+AES-128-CCM:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+DHE-RSA${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${srcdir}/params.dh"  & PID=$!
-  wait_server ${PID}
-
-  "${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  echo "Check TLS 1.2 with AES-128-CCM-8-DHE-RSA ciphersuite"
-  launch_server $$  --priority "NONE:-CIPHER-ALL:+AES-128-CCM-8:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+DHE-RSA${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" --dhparams "${srcdir}/params.dh"  & PID=$!
-  wait_server ${PID}
-
-  "${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  #echo "Check TLS 1.2 with DHE-DSS ciphersuite"
-  #launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+DHE-DSS${ADD}" --x509certfile "${SERV_DSA_CERT}" --x509keyfile "${SERV_DSA_KEY}" --dhparams "${srcdir}/params.dh"  & PID=$!
-  #wait_server ${PID}
-  #
-  #"${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-  #  fail ${PID} "Failed"
-  #
-  #kill ${PID}
-  #wait
-
-  echo "Check TLS 1.2 with ECDHE-RSA ciphersuite"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+ECDHE-RSA:+CURVE-ALL${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" & PID=$!
-  wait_server ${PID}
-
-  #-cipher ECDHE-RSA-AES128-SHA
-  "${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  if test ${ALL_CURVES} = 1;then
-    echo "Check TLS 1.2 with ECDHE-ECDSA ciphersuite (SECP224R1)"
-    launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+ECDHE-ECDSA:+CURVE-ALL${ADD}" --x509certfile "${ECC224_CERT}" --x509keyfile "${ECC224_KEY}" --x509cafile "${CA_ECC_CERT}" & PID=$!
-    wait_server ${PID}
-
-    #-cipher ECDHE-ECDSA-AES128-SHA
-    "${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${ECC224_CERT}" key_file="${ECC224_KEY}" ca_file="${CA_ECC_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-      fail ${PID} "Failed"
-
-    kill ${PID}
-    wait
-  fi
-
-  echo "Check TLS 1.2 with ECDHE-ECDSA ciphersuite (SECP256R1)"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+ECDHE-ECDSA:+CURVE-ALL${ADD}" --x509certfile "${ECC256_CERT}" --x509keyfile "${ECC256_KEY}" --x509cafile "${CA_ECC_CERT}" & PID=$!
-  wait_server ${PID}
-
-  #-cipher ECDHE-ECDSA-AES128-SHA
-  "${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${ECC256_CERT}" key_file="${ECC256_KEY}" ca_file="${CA_ECC_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  echo "Check TLS 1.2 with ECDHE-ECDSA ciphersuite (SECP384R1)"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+ECDHE-ECDSA:+CURVE-ALL${ADD}" --x509certfile "${ECC384_CERT}" --x509keyfile "${ECC384_KEY}" --x509cafile "${CA_ECC_CERT}" & PID=$!
-  wait_server ${PID}
-
-  #-cipher ECDHE-ECDSA-AES128-SHA
-  "${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${ECC384_CERT}" key_file="${ECC384_KEY}" ca_file="${CA_ECC_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  echo "Check TLS 1.2 with ECDHE-ECDSA ciphersuite (SECP521R1)"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+ECDHE-ECDSA:+CURVE-ALL${ADD}" --x509certfile "${ECC521_CERT}" --x509keyfile "${ECC521_KEY}" --x509cafile "${CA_ECC_CERT}" & PID=$!
-  wait_server ${PID}
-
-  #-cipher ECDHE-ECDSA-AES128-SHA
-  "${POLARSSL_CLI}"  server_name=localhost min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${ECC521_CERT}" key_file="${ECC521_KEY}" ca_file="${CA_ECC_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  echo "Check TLS 1.2 with PSK ciphersuite"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+PSK:+CURVE-ALL${ADD}" --pskpasswd "${SERV_PSK}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" & PID=$!
-  wait_server ${PID}
-
-  #-cipher PSK-AES128-SHA
-  "${POLARSSL_CLI}"  server_name=localhost psk_identity=jas psk=9e32cf7786321a828ef7668f09fb35db min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  echo "Check TLS 1.2 with DHE-PSK ciphersuite"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+DHE-PSK:+CURVE-ALL${ADD}" --pskpasswd "${SERV_PSK}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" & PID=$!
-  wait_server ${PID}
-
-  #-cipher PSK-AES128-SHA
-  "${POLARSSL_CLI}"  server_name=localhost psk_identity=jas psk=9e32cf7786321a828ef7668f09fb35db min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  echo "Check TLS 1.2 with ECDHE-PSK ciphersuite"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+ECDHE-PSK:+CURVE-ALL${ADD}" --pskpasswd "${SERV_PSK}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" & PID=$!
-  wait_server ${PID}
-
-  #-cipher PSK-AES128-SHA
-  "${POLARSSL_CLI}"  server_name=localhost psk_identity=jas psk=9e32cf7786321a828ef7668f09fb35db min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
-
-  echo "Check TLS 1.2 with RSA-PSK ciphersuite"
-  launch_server $$  --priority "NONE:+CIPHER-ALL:+SIGN-ALL:+COMP-NULL:+MAC-ALL:+VERS-TLS1.2:+RSA-PSK:+CURVE-ALL${ADD}" --pskpasswd "${SERV_PSK}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" & PID=$!
-  wait_server ${PID}
-
-  #-cipher RSA-PSK-AES128-SHA
-  "${POLARSSL_CLI}"  server_name=localhost psk_identity=jas psk=9e32cf7786321a828ef7668f09fb35db min_version=tls1_2 max_version=tls1_2 server_port="${PORT}" crt_file="${CLI_CERT}" key_file="${CLI_KEY}" ca_file="${CA_CERT}" </dev/null >>"${LOGFILE}" 2>&1 || \
-    fail ${PID} "Failed"
-
-  kill ${PID}
-  wait
+	kill ${PID}
+	wait
 done
 
 rm -f "${LOGFILE}"