commit 0759d369e6ec85f7060ad4e9b9bf0b7591720c18
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Dec 17 11:50:52 2013 +0100
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Dec 17 11:50:52 2013 +0100
tree 5a42f8cabdebcc486c66645eae4f17a9b856da4e
parent 31a23258109be5c813be5b91fef145224e68806c

Fix ciphersuite selection in compat.sh

tests/compat.sh

diff --git a/tests/compat.sh b/tests/compat.sh
index 03c6bfe..36f241b 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -120,6 +120,9 @@
 for TYPE in $TYPES;
 do
 
+P_CIPHERS=""
+O_CIPHERS=""
+
 case $TYPE in
 
     "ECDSA")
@@ -131,7 +134,7 @@
 
         if [ "$MODE" != "ssl3" ];
         then
-            P_CIPHERS="                                 \
+            P_CIPHERS="$P_CIPHERS                       \
                 TLS-ECDHE-ECDSA-WITH-NULL-SHA           \
                 TLS-ECDHE-ECDSA-WITH-RC4-128-SHA        \
                 TLS-ECDHE-ECDSA-WITH-3DES-EDE-CBC-SHA   \
@@ -144,7 +147,7 @@
                 TLS-ECDH-ECDSA-WITH-AES-256-CBC-SHA     \
                 "
 
-            O_CIPHERS="                         \
+            O_CIPHERS="$O_CIPHERS               \
                 ECDHE-ECDSA-NULL-SHA            \
                 ECDHE-ECDSA-RC4-SHA             \
                 ECDHE-ECDSA-DES-CBC3-SHA        \
@@ -171,7 +174,7 @@
                 TLS-ECDH-ECDSA-WITH-AES-256-GCM-SHA384          \
                 "
 
-            O_CIPHERS="                         \
+            O_CIPHERS="$O_CIPHERS               \
                 ECDHE-ECDSA-AES128-SHA256       \
                 ECDHE-ECDSA-AES256-SHA384       \
                 ECDHE-ECDSA-AES128-GCM-SHA256   \
@@ -192,7 +195,7 @@
         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="                                 \
+        P_CIPHERS="$P_CIPHERS                       \
             TLS-DHE-RSA-WITH-AES-128-CBC-SHA        \
             TLS-DHE-RSA-WITH-AES-256-CBC-SHA        \
             TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA   \
@@ -211,7 +214,7 @@
             TLS-DHE-RSA-WITH-DES-CBC-SHA            \
             "
 
-        O_CIPHERS="                         \
+        O_CIPHERS="$O_CIPHERS               \
             DHE-RSA-AES128-SHA              \
             DHE-RSA-AES256-SHA              \
             DHE-RSA-CAMELLIA128-SHA         \
@@ -232,7 +235,7 @@
 
         if [ "$MODE" != "ssl3" ];
         then
-            P_CIPHERS="                                 \
+            P_CIPHERS="$P_CIPHERS                       \
                 TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA      \
                 TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA      \
                 TLS-ECDHE-RSA-WITH-3DES-EDE-CBC-SHA     \
@@ -240,7 +243,7 @@
                 TLS-ECDHE-RSA-WITH-NULL-SHA             \
                 "
 
-            O_CIPHERS="                         \
+            O_CIPHERS="$O_CIPHERS               \
                 ECDHE-RSA-AES256-SHA            \
                 ECDHE-RSA-AES128-SHA            \
                 ECDHE-RSA-DES-CBC3-SHA          \
@@ -294,14 +297,14 @@
         O_SERVER_ARGS="$O_SERVER_BASE -psk 6162636465666768696a6b6c6d6e6f70 -cert data_files/server1.crt -key data_files/server1.key"
         O_CLIENT_ARGS="$O_CLIENT_BASE -psk 6162636465666768696a6b6c6d6e6f70"
 
-        P_CIPHERS="                                 \
+        P_CIPHERS="$P_CIPHERS                       \
             TLS-PSK-WITH-RC4-128-SHA                \
             TLS-PSK-WITH-3DES-EDE-CBC-SHA           \
             TLS-PSK-WITH-AES-128-CBC-SHA            \
             TLS-PSK-WITH-AES-256-CBC-SHA            \
             "
 
-        O_CIPHERS="                         \
+        O_CIPHERS="$O_CIPHERS               \
             PSK-RC4-SHA                     \
             PSK-3DES-EDE-CBC-SHA            \
             PSK-AES128-CBC-SHA              \