aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_test_lib.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-01-26 15:26:26 +0100
committerIngela Anderton Andin <[email protected]>2018-01-26 15:26:26 +0100
commit177eab3b67d9840c75d9986cd8870a84414bcacb (patch)
tree4a8f2d766e23beb2fabc888a69354a7c18d4ef9f /lib/ssl/test/ssl_test_lib.erl
parent6067c503ec651cd204c81531791188c0a2fa6394 (diff)
parent80de6b173fb12cfdb0b511531a4b0d2ad33d4098 (diff)
downloadotp-177eab3b67d9840c75d9986cd8870a84414bcacb.tar.gz
otp-177eab3b67d9840c75d9986cd8870a84414bcacb.tar.bz2
otp-177eab3b67d9840c75d9986cd8870a84414bcacb.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
-rw-r--r--lib/ssl/test/ssl_test_lib.erl26
1 files changed, 26 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 94d10b2f9b..7e983f5079 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1313,6 +1313,32 @@ cipher_restriction(Config0) ->
Config0
end.
+openssl_dsa_support() ->
+ case os:cmd("openssl version") of
+ "LibreSSL 2.6.1" ++ _ ->
+ true;
+ "LibreSSL 2.6.2" ++ _ ->
+ true;
+ "LibreSSL 2.6" ++ _ ->
+ false;
+ "LibreSSL 2.4" ++ _ ->
+ true;
+ "LibreSSL 2.3" ++ _ ->
+ true;
+ "LibreSSL 2.2" ++ _ ->
+ true;
+ "LibreSSL 2.1" ++ _ ->
+ true;
+ "LibreSSL 2.0" ++ _ ->
+ true;
+ "LibreSSL" ++ _ ->
+ false;
+ "OpenSSL 1.0.1" ++ Rest ->
+ hd(Rest) >= s;
+ _ ->
+ true
+ end.
+
check_sane_openssl_version(Version) ->
case supports_ssl_tls_version(Version) of
true ->