aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2019-07-25 09:48:56 +0200
committerIngela Anderton Andin <[email protected]>2019-07-25 09:48:56 +0200
commit1ecd121b16d926220f8672fa99b19f9cbf3326ce (patch)
treeda5cd45e6ebafc647301518f02b919798c0baf59
parenta8976b67f9ebdd0715d6c68745ecd4519387e98a (diff)
parentfc2fb193f1c28e0581530e0f4cebac6c8237879f (diff)
downloadotp-1ecd121b16d926220f8672fa99b19f9cbf3326ce.tar.gz
otp-1ecd121b16d926220f8672fa99b19f9cbf3326ce.tar.bz2
otp-1ecd121b16d926220f8672fa99b19f9cbf3326ce.zip
Merge branch 'maint'
-rw-r--r--lib/ssl/test/ssl_test_lib.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 49e7b50b1b..5d0d09b33a 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -2110,6 +2110,8 @@ check_sane_openssl_version(Version) ->
false;
{'tlsv1.1', "OpenSSL 0" ++ _} ->
false;
+ {'tlsv1', "OpenSSL 0" ++ _} ->
+ false;
{_, _} ->
true
end;