aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_test_lib.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-09-14 16:14:21 +0200
committerIngela Anderton Andin <[email protected]>2018-09-20 15:27:51 +0200
commit012cb5bdafddf3e2b4279f001d4b2b5e0e96e367 (patch)
tree2ee787a4ffc92a9c6c80807c41b88a23f09b758c /lib/ssl/test/ssl_test_lib.erl
parent668607afa7ccbe9289dead30d81cb39c18fa4789 (diff)
downloadotp-012cb5bdafddf3e2b4279f001d4b2b5e0e96e367.tar.gz
otp-012cb5bdafddf3e2b4279f001d4b2b5e0e96e367.tar.bz2
otp-012cb5bdafddf3e2b4279f001d4b2b5e0e96e367.zip
ssl: Improve interop checks
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
-rw-r--r--lib/ssl/test/ssl_test_lib.erl14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index a391b52c1a..f3235f5614 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1644,6 +1644,8 @@ openssl_dsa_support() ->
true;
"LibreSSL" ++ _ ->
false;
+ "OpenSSL 1.1" ++ Rest ->
+ false;
"OpenSSL 1.0.1" ++ Rest ->
hd(Rest) >= s;
_ ->
@@ -1854,13 +1856,11 @@ do_supports_ssl_tls_version(Port, Acc) ->
case Acc ++ Data of
"unknown option" ++ _ ->
false;
- Error when length(Error) >= 11 ->
- case lists:member("error", string:tokens(Data, ":")) of
- true ->
- false;
- false ->
- do_supports_ssl_tls_version(Port, Error)
- end;
+ "s_client: Option unknown" ++ _->
+ false;
+ Info when length(Info) >= 24 ->
+ ct:pal("~p", [Info]),
+ true;
_ ->
do_supports_ssl_tls_version(Port, Acc ++ Data)
end