diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-09-11 10:36:27 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-09-11 10:36:27 +0200 |
| commit | c3030004b983348416795848495a2cdc8304fbcc (patch) | |
| tree | 7d297a07ecffddd9c47ddcd58ff1ebce6977b9db /lib/ssl | |
| parent | 01455c2e5397702a887cf194c1fa12f2461e6dda (diff) | |
| parent | 85f7e5876a66f5054a50c148fc312810defd4057 (diff) | |
| download | otp-c3030004b983348416795848495a2cdc8304fbcc.tar.gz otp-c3030004b983348416795848495a2cdc8304fbcc.tar.bz2 otp-c3030004b983348416795848495a2cdc8304fbcc.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl')
| -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 17eadcb8e9..a5f03a1f15 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]; |