diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-09-11 10:35:35 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-09-11 10:35:35 +0200 |
| commit | 85f7e5876a66f5054a50c148fc312810defd4057 (patch) | |
| tree | ad3286d1315dcaaba0b4a7edbe39b7ded39a58be | |
| parent | a1601976d5a3eb8027a7f292b0071dd28688c51f (diff) | |
| parent | d50f9a8ad278bca3f7e6ac891f6398c328a275a0 (diff) | |
| download | otp-85f7e5876a66f5054a50c148fc312810defd4057.tar.gz otp-85f7e5876a66f5054a50c148fc312810defd4057.tar.bz2 otp-85f7e5876a66f5054a50c148fc312810defd4057.zip | |
Merge branch 'ingela/ssl/openssl-cuddle' into maint
* ingela/ssl/openssl-cuddle:
ssl: OpenSSL-1.0.0 is really broken
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 8 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index ba061cb19c..aae2927575 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1251,9 +1251,13 @@ check_sane_openssl_version(Version) -> true; {_, "OpenSSL 1.0.1" ++ _} -> true; - {'tlsv1.2', "OpenSSL 1.0" ++ _} -> + {'tlsv1.2', "OpenSSL 1.0.0" ++ _} -> false; - {'tlsv1.1', "OpenSSL 1.0" ++ _} -> + {'tlsv1.1', "OpenSSL 1.0.0" ++ _} -> + false; + {'dtlsv1.2', "OpenSSL 1.0.0" ++ _} -> + false; + {'dtlsv1', "OpenSSL 1.0.0" ++ _} -> false; {'tlsv1.2', "OpenSSL 0" ++ _} -> false; diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index c4fe97d88e..2e1a0b94ea 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -156,7 +156,8 @@ end_per_suite(_Config) -> ssl:stop(), application:stop(crypto). -init_per_group(basic, Config) -> +init_per_group(basic, Config0) -> + Config = ssl_test_lib:clean_tls_version(Config0), case ssl_test_lib:supports_ssl_tls_version(sslv2) of true -> [{v2_hello_compatible, true} | Config]; |