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/test/ssl_test_lib.erl | |
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/test/ssl_test_lib.erl')
-rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 8 |
1 files changed, 6 insertions, 2 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; |