aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_test_lib.erl
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2018-12-04 13:44:28 +0100
committerRaimo Niskanen <[email protected]>2018-12-04 13:44:28 +0100
commit9ddbbb2b6a989e0199c7acba27e55044ecb975c8 (patch)
tree921504dfb5820046ede7f0a26219855292dc4e20 /lib/ssl/test/ssl_test_lib.erl
parentaa75927da32dd9edbc4311efdfead11045180d43 (diff)
parent645d0bbe9eff5620e5f9daf61b0658bcdadd0665 (diff)
downloadotp-9ddbbb2b6a989e0199c7acba27e55044ecb975c8.tar.gz
otp-9ddbbb2b6a989e0199c7acba27e55044ecb975c8.tar.bz2
otp-9ddbbb2b6a989e0199c7acba27e55044ecb975c8.zip
Merge branch 'raimo/ssl/tls_dist-profiling' into maint
* raimo/ssl/tls_dist-profiling: Improve benchmark Implement print on other node Fix compiler warnings
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
-rw-r--r--lib/ssl/test/ssl_test_lib.erl7
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" ++ _ ->