diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-06-27 15:32:00 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-06-27 15:32:00 +0200 |
| commit | 47fc5311bc58199db92269e5dcb014656475d4c0 (patch) | |
| tree | 6bb96439513bf62f2f773eb78acc82564ee833a2 | |
| parent | cd624830428978aa466369eb8951fa510753d781 (diff) | |
| parent | 798924ffd5efff77ba94ea7f54c2e69548d9d07e (diff) | |
| download | otp-47fc5311bc58199db92269e5dcb014656475d4c0.tar.gz otp-47fc5311bc58199db92269e5dcb014656475d4c0.tar.bz2 otp-47fc5311bc58199db92269e5dcb014656475d4c0.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 5 |
2 files changed, 7 insertions, 0 deletions
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; diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 77c21d9b57..33497798c5 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; @@ -1419,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", |