aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2019-07-25 09:48:12 +0200
committerIngela Anderton Andin <[email protected]>2019-07-25 09:48:12 +0200
commitfc2fb193f1c28e0581530e0f4cebac6c8237879f (patch)
treee11c1df27e7e6a7c91b1ea7227065c1f66ec6f0c
parent8418260650c37153dffb0515485dcfc0ff4af55c (diff)
parent095f82ff0b9a7b9d6517ee1e715fc32d38965626 (diff)
downloadotp-fc2fb193f1c28e0581530e0f4cebac6c8237879f.tar.gz
otp-fc2fb193f1c28e0581530e0f4cebac6c8237879f.tar.bz2
otp-fc2fb193f1c28e0581530e0f4cebac6c8237879f.zip
Merge branch 'ingela/ssl/sane-openssl' into maint
* ingela/ssl/sane-openssl: ssl: Old OpenSSL implementation does not ignore trailing client hello data
-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;