update test scripts for openssl 1.1.1 (no more 3des and rc4)

mirleft · Jan 7, 2019 · fcd965e · fcd965e
1 parent c36c66f
commit fcd965e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/tests/interop-openssl-sclient.sh b/tests/interop-openssl-sclient.sh
@@ -43,14 +43,19 @@ testit
 extra_args="-tls1_2"
 testit
 
-ciphers="DHE-RSA-AES256-SHA AES256-SHA DHE-RSA-AES128-SHA AES128-SHA EDH-RSA-DES-CBC3-SHA DES-CBC3-SHA RC4-SHA RC4-MD5"
+ciphers="DHE-RSA-AES256-SHA AES256-SHA DHE-RSA-AES128-SHA AES128-SHA"
+#OpenSSL <1.1.1:
+#EDH-RSA-DES-CBC3-SHA DES-CBC3-SHA RC4-SHA RC4-MD5
 for i in $ciphers; do
-    if [ $i != "RC4-MD5" ]; then
-        extra_args="-cipher $i"
-        testit
-    else
-        echo "not testing RC4-MD5 without tls version (openssl will use SSLv2 which fails)"
-    fi
+#    if [ $i != "RC4-MD5" ]; then
+#        extra_args="-cipher $i"
+#        testit
+#    else
+#        echo "not testing RC4-MD5 without tls version (openssl will use SSLv2 which fails)"
+#    fi
+
+    extra_args="-cipher $i"
+    testit
 
     extra_args="-tls1 -cipher $i"
     testit

diff --git a/tests/interop-openssl-sserver.sh b/tests/interop-openssl-sserver.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-s_server_args="s_server -no_tmp_rsa -quiet -key ../certificates/server.key -cert ../certificates/server.pem -www -dhparam dh.pem "
+s_server_args="s_server -quiet -key ../certificates/server.key -cert ../certificates/server.pem -www -dhparam dh.pem "
 
 pidfile='/tmp/openssl.pid'
 
@@ -35,7 +35,9 @@ testit
 extra_args="-tls1_2"
 testit
 
-ciphers="DHE-RSA-AES256-SHA AES256-SHA DHE-RSA-AES128-SHA AES128-SHA EDH-RSA-DES-CBC3-SHA DES-CBC3-SHA RC4-SHA RC4-MD5"
+ciphers="DHE-RSA-AES256-SHA AES256-SHA DHE-RSA-AES128-SHA AES128-SHA"
+#OpenSSL <1.1.1:
+#EDH-RSA-DES-CBC3-SHA DES-CBC3-SHA RC4-SHA RC4-MD5
 for i in $ciphers; do
     extra_args="-cipher $i"
     testit