From eb1714e9c82636fc2735a21459f0a02cfcdf771f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Fri, 20 Sep 2013 12:44:08 +0200 Subject: [PATCH] Fix certs/psk arguments in compat.sh --- tests/compat.sh | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/compat.sh b/tests/compat.sh index ddb2cf960..a001ddb5d 100755 --- a/tests/compat.sh +++ b/tests/compat.sh @@ -89,15 +89,15 @@ do if [ "X$VERIFY" = "XYES" ]; then - P_SERVER_ARGS="ca_file=data_files/test-ca_cat12.crt auth_mode=required" - P_CLIENT_ARGS="ca_file=data_files/test-ca_cat12.crt" - O_SERVER_ARGS="-CAfile data_files/test-ca_cat12.crt -Verify 10" - O_CLIENT_ARGS="-CAfile data_files/test-ca_cat12.crt" + P_SERVER_BASE="ca_file=data_files/test-ca_cat12.crt auth_mode=required" + P_CLIENT_BASE="ca_file=data_files/test-ca_cat12.crt" + O_SERVER_BASE="-CAfile data_files/test-ca_cat12.crt -Verify 10" + O_CLIENT_BASE="-CAfile data_files/test-ca_cat12.crt" else - P_SERVER_ARGS="" - P_CLIENT_ARGS="" - O_SERVER_ARGS="" - O_CLIENT_ARGS="" + P_SERVER_BASE="" + P_CLIENT_BASE="" + O_SERVER_BASE="" + O_CLIENT_BASE="" fi @@ -124,10 +124,10 @@ case $TYPE in "ECDSA") - P_SERVER_ARGS="$P_SERVER_ARGS crt_file=data_files/server5.crt key_file=data_files/server5.key" - P_CLIENT_ARGS="$P_CLIENT_ARGS crt_file=data_files/server6.crt key_file=data_files/server6.key" - O_SERVER_ARGS="$O_SERVER_ARGS -cert data_files/server5.crt -key data_files/server5.key" - O_CLIENT_ARGS="$O_CLIENT_ARGS -cert data_files/server6.crt -key data_files/server6.key" + P_SERVER_ARGS="$P_SERVER_BASE crt_file=data_files/server5.crt key_file=data_files/server5.key" + P_CLIENT_ARGS="$P_CLIENT_BASE crt_file=data_files/server6.crt key_file=data_files/server6.key" + O_SERVER_ARGS="$O_SERVER_BASE -cert data_files/server5.crt -key data_files/server5.key" + O_CLIENT_ARGS="$O_CLIENT_BASE -cert data_files/server6.crt -key data_files/server6.key" P_CIPHERS=" \ TLS-ECDHE-ECDSA-WITH-NULL-SHA \ @@ -166,10 +166,10 @@ case $TYPE in "RSA") - P_SERVER_ARGS="$P_SERVER_ARGS crt_file=data_files/server1.crt key_file=data_files/server1.key" - P_CLIENT_ARGS="$P_CLIENT_ARGS crt_file=data_files/server2.crt key_file=data_files/server2.key" - O_SERVER_ARGS="$O_SERVER_ARGS -cert data_files/server1.crt -key data_files/server1.key" - O_CLIENT_ARGS="$O_CLIENT_ARGS -cert data_files/server2.crt -key data_files/server2.key" + P_SERVER_ARGS="$P_SERVER_BASE crt_file=data_files/server1.crt key_file=data_files/server1.key" + P_CLIENT_ARGS="$P_CLIENT_BASE crt_file=data_files/server2.crt key_file=data_files/server2.key" + O_SERVER_ARGS="$O_SERVER_BASE -cert data_files/server1.crt -key data_files/server1.key" + O_CLIENT_ARGS="$O_CLIENT_BASE -cert data_files/server2.crt -key data_files/server2.key" P_CIPHERS=" \ TLS-DHE-RSA-WITH-AES-128-CBC-SHA \ @@ -260,10 +260,10 @@ case $TYPE in "PSK") - P_SERVER_ARGS="$P_SERVER_ARGS psk=6162636465666768696a6b6c6d6e6f70" - P_CLIENT_ARGS="$P_CLIENT_ARGS psk=6162636465666768696a6b6c6d6e6f70" - O_SERVER_ARGS="$O_SERVER_ARGS -psk 6162636465666768696a6b6c6d6e6f70" - O_CLIENT_ARGS="$O_CLIENT_ARGS -psk 6162636465666768696a6b6c6d6e6f70" + P_SERVER_ARGS="$P_SERVER_BASE psk=6162636465666768696a6b6c6d6e6f70" + P_CLIENT_ARGS="$P_CLIENT_BASE psk=6162636465666768696a6b6c6d6e6f70" + O_SERVER_ARGS="$O_SERVER_BASE -psk 6162636465666768696a6b6c6d6e6f70" + O_CLIENT_ARGS="$O_CLIENT_BASE -psk 6162636465666768696a6b6c6d6e6f70" P_CIPHERS=" \ TLS-PSK-WITH-RC4-128-SHA \