diff options
author | Ingela Anderton Andin <[email protected]> | 2018-09-20 15:36:25 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2018-09-20 15:36:25 +0200 |
commit | 50274e72fa6278f4f43ffe9fbf461683916dce09 (patch) | |
tree | 95ac25112ce9354d1087516606eb3bc3d52ea23c /lib/ssl/test/ssl_test_lib.erl | |
parent | 03b94b23f109fe43c51c64bf8d009f08e6025fbb (diff) | |
parent | 012cb5bdafddf3e2b4279f001d4b2b5e0e96e367 (diff) | |
download | otp-50274e72fa6278f4f43ffe9fbf461683916dce09.tar.gz otp-50274e72fa6278f4f43ffe9fbf461683916dce09.tar.bz2 otp-50274e72fa6278f4f43ffe9fbf461683916dce09.zip |
Merge branch 'ingela/ssl/openssl-test-interop' into maint
* ingela/ssl/openssl-test-interop:
ssl: Improve interop checks
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 |