diff options
| author | Raimo Niskanen <[email protected]> | 2018-12-04 13:49:29 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2018-12-04 14:36:03 +0100 |
| commit | 09b620eae7ebb623d7e62cbcab28c06e65d90008 (patch) | |
| tree | 8a3821ad4e51c66a6d6b14503f1e52856bdeef30 /lib/ssl/test/ssl_test_lib.erl | |
| parent | 27e2677c08252b427690698e40c22c459bbaa83c (diff) | |
| parent | f37c8b37f49034fe10898ea47ed9c043ad2ba173 (diff) | |
| download | otp-09b620eae7ebb623d7e62cbcab28c06e65d90008.tar.gz otp-09b620eae7ebb623d7e62cbcab28c06e65d90008.tar.bz2 otp-09b620eae7ebb623d7e62cbcab28c06e65d90008.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/test/ssl_dist_bench_SUITE.erl
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 8a2f0824fb..a8d62d6c4e 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -26,6 +26,7 @@ %% Note: This directive should only be used in test suites. -compile(export_all). +-compile(nowarn_export_all). -record(sslsocket, { fd = nil, pid = nil}). -define(SLEEP, 1000). @@ -1706,10 +1707,10 @@ openssl_dsa_support() -> true; "LibreSSL" ++ _ -> false; - "OpenSSL 1.1" ++ Rest -> + "OpenSSL 1.1" ++ _Rest -> false; "OpenSSL 1.0.1" ++ Rest -> - hd(Rest) >= s; + hd(Rest) >= $s; _ -> true end. @@ -1746,8 +1747,6 @@ openssl_sane_client_cert() -> false; "LibreSSL 2.0" ++ _ -> false; - "LibreSSL 2.0" ++ _ -> - false; "OpenSSL 1.0.1s-freebsd" -> false; "OpenSSL 1.0.0" ++ _ -> |