- Moved ciphersuite naming scheme to IANA reserved names
diff --git a/tests/compat.sh b/tests/compat.sh
index c6bfa6e..4c292b0 100644
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -1,4 +1,4 @@
-killall -q openssl ssl_server
+killall -q openssl ssl_server ssl_server2
MODES="ssl3 tls1 tls1_1 tls1_2"
#VERIFY="YES"
@@ -16,23 +16,23 @@
echo "Running for $MODE"
echo "-----------"
-P_CIPHERS=" \
- SSL-EDH-RSA-AES-128-SHA \
- SSL-EDH-RSA-AES-256-SHA \
- SSL-EDH-RSA-CAMELLIA-128-SHA \
- SSL-EDH-RSA-CAMELLIA-256-SHA \
- SSL-EDH-RSA-DES-168-SHA \
- SSL-RSA-AES-256-SHA \
- SSL-RSA-CAMELLIA-256-SHA \
- SSL-RSA-AES-128-SHA \
- SSL-RSA-CAMELLIA-128-SHA \
- SSL-RSA-DES-168-SHA \
- SSL-RSA-RC4-128-SHA \
- SSL-RSA-RC4-128-MD5 \
- SSL-RSA-NULL-MD5 \
- SSL-RSA-NULL-SHA \
- SSL-RSA-DES-SHA \
- SSL-EDH-RSA-DES-SHA \
+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 \
+ TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA \
+ TLS-DHE-RSA-WITH-3DES-EDE-CBC-SHA \
+ TLS-RSA-WITH-AES-256-CBC-SHA \
+ TLS-RSA-WITH-CAMELLIA-256-CBC-SHA \
+ TLS-RSA-WITH-AES-128-CBC-SHA \
+ TLS-RSA-WITH-CAMELLIA-128-CBC-SHA \
+ TLS-RSA-WITH-3DES-EDE-CBC-SHA \
+ TLS-RSA-WITH-RC4-128-SHA \
+ TLS-RSA-WITH-RC4-128-MD5 \
+ TLS-RSA-WITH-NULL-MD5 \
+ TLS-RSA-WITH-NULL-SHA \
+ TLS-RSA-WITH-DES-CBC-SHA \
+ TLS-DHE-RSA-WITH-DES-CBC-SHA \
"
O_CIPHERS=" \
@@ -56,12 +56,12 @@
# Also add SHA256 ciphersuites
#
-P_CIPHERS="$P_CIPHERS \
- SSL-RSA-NULL-SHA256 \
- SSL-RSA-AES-128-SHA256 \
- SSL-EDH-RSA-AES-128-SHA256 \
- SSL-RSA-AES-256-SHA256 \
- SSL-EDH-RSA-AES-256-SHA256 \
+P_CIPHERS="$P_CIPHERS \
+ TLS-RSA-WITH-NULL-SHA256 \
+ TLS-RSA-WITH-AES-128-CBC-SHA256 \
+ TLS-DHE-RSA-WITH-AES-128-CBC-SHA256 \
+ TLS-RSA-WITH-AES-256-CBC-SHA256 \
+ TLS-DHE-RSA-WITH-AES-256-CBC-SHA256 \
"
O_CIPHERS="$O_CIPHERS \
@@ -74,11 +74,11 @@
if [ "$MODE" = "tls1_2" ];
then
- P_CIPHERS="$P_CIPHERS \
- SSL-RSA-AES-128-GCM-SHA256 \
- SSL-EDH-RSA-AES-128-GCM-SHA256 \
- SSL-RSA-AES-256-GCM-SHA384 \
- SSL-EDH-RSA-AES-256-GCM-SHA384 \
+ P_CIPHERS="$P_CIPHERS \
+ TLS-RSA-WITH-AES-128-GCM-SHA256 \
+ TLS-RSA-WITH-AES-256-GCM-SHA384 \
+ TLS-DHE-RSA-WITH-AES-128-GCM-SHA256 \
+ TLS-DHE-RSA-WITH-AES-256-GCM-SHA384 \
"
O_CIPHERS="$O_CIPHERS \
@@ -112,7 +112,7 @@
done
kill $PROCESS_ID
-../programs/ssl/ssl_server > /dev/null &
+../programs/ssl/ssl_server2 > /dev/null &
PROCESS_ID=$!
sleep 1
@@ -140,7 +140,7 @@
kill $PROCESS_ID
-../programs/ssl/ssl_server > /dev/null &
+../programs/ssl/ssl_server2 > /dev/null &
PROCESS_ID=$!
sleep 1
@@ -150,11 +150,11 @@
#
if [ "$MODE" = "tls1_2" ];
then
- P_CIPHERS="$P_CIPHERS \
- SSL-RSA-CAMELLIA-128-SHA256 \
- SSL-EDH-RSA-CAMELLIA-128-SHA256 \
- SSL-RSA-CAMELLIA-256-SHA256 \
- SSL-EDH-RSA-CAMELLIA-256-SHA256 \
+ P_CIPHERS="$P_CIPHERS \
+ TLS-RSA-WITH-CAMELLIA-128-CBC-SHA256 \
+ TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA256 \
+ TLS-RSA-WITH-CAMELLIA-256-CBC-SHA256 \
+ TLS-DHE-RSA-WITH-CAMELLIA-256-CBC-SHA256 \
"
fi