From 6fcfa3bab32e250a1f776dbfa326761e473b3a73 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Thu, 15 Jun 2017 14:38:17 +0200 Subject: ssl: Increase timeout for testcase testing ECDH keyexchange with RSA signed certs --- lib/ssl/test/ssl_basic_SUITE.erl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 407152aa75..64f9927901 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -360,6 +360,8 @@ init_per_testcase(TestCase, Config) when TestCase == psk_cipher_suites; TestCase == psk_with_hint_cipher_suites; TestCase == ciphers_rsa_signed_certs; TestCase == ciphers_rsa_signed_certs_openssl_names; + TestCase == ciphers_ecdh_rsa_signed_certs_openssl_names; + TestCase == ciphers_ecdh_rsa_signed_certs; TestCase == ciphers_dsa_signed_certs; TestCase == ciphers_dsa_signed_certs_openssl_names; TestCase == anonymous_cipher_suites; -- cgit v1.2.3 From 34cead57896c89ae27c6a9dcc74c171247595eec Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Thu, 15 Jun 2017 14:42:10 +0200 Subject: ssl: Skip sslv3 interop with newer OpenSSL --- lib/ssl/test/ssl_test_lib.erl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 77c21d9b57..1394fc486f 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1310,6 +1310,8 @@ check_sane_openssl_version(Version) -> false; {'dtlsv1.2', "OpenSSL 0" ++ _} -> false; + {'sslv3', "OpenSSL 1.0.2" ++ _} -> + false; {_, _} -> true end; -- cgit v1.2.3 From 67eda42fcd2f592f578ebcac3371ee9eb8941f31 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Thu, 15 Jun 2017 16:46:32 +0200 Subject: ssl: Skip sslv2 hello compatible tests on OpenSSL-0.9.8o The -ssl2 option to s_client appears to be broken on this release. This is a legacy option anyway that is still tested on other old version of OpenSSL so skip this. --- lib/ssl/test/ssl_test_lib.erl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 1394fc486f..33497798c5 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1421,6 +1421,9 @@ supports_ssl_tls_version(sslv2 = Version) -> case os:cmd("openssl version") of "OpenSSL 1" ++ _ -> false; + %% Appears to be broken + "OpenSSL 0.9.8.o" ++ _ -> + false; _ -> VersionFlag = version_flag(Version), Exe = "openssl", -- cgit v1.2.3