diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-09-20 15:37:02 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-09-20 15:37:02 +0200 |
| commit | ab62dd2e77afac117f431bda449da811b140c153 (patch) | |
| tree | 4df9461acc5c7811fc6386fdfab8ff100fd1add2 /lib/ssl/test/ssl_test_lib.erl | |
| parent | 4e3e46e3d198e4c7aae7bbb73ce0d6f4e199a66b (diff) | |
| parent | 50274e72fa6278f4f43ffe9fbf461683916dce09 (diff) | |
| download | otp-ab62dd2e77afac117f431bda449da811b140c153.tar.gz otp-ab62dd2e77afac117f431bda449da811b140c153.tar.bz2 otp-ab62dd2e77afac117f431bda449da811b140c153.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 14 |
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 |