aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_test_lib.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-01-26 15:23:18 +0100
committerIngela Anderton Andin <[email protected]>2018-01-26 15:23:18 +0100
commit80de6b173fb12cfdb0b511531a4b0d2ad33d4098 (patch)
tree01512e393dc26855c74d8776934610268291f6cd /lib/ssl/test/ssl_test_lib.erl
parente12be4b294f1ae82023cc50399ce17e5eb7e4c35 (diff)
parentc0dd8fa1446b276d35557ede18199c629b2ed590 (diff)
downloadotp-80de6b173fb12cfdb0b511531a4b0d2ad33d4098.tar.gz
otp-80de6b173fb12cfdb0b511531a4b0d2ad33d4098.tar.bz2
otp-80de6b173fb12cfdb0b511531a4b0d2ad33d4098.zip
Merge branch 'ingela/ssl/no-dsa-libressl' into maint
* ingela/ssl/no-dsa-libressl: ssl: Check OpenSSL version for DSS (DSA) support
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 f9cc6ab8b7..5c9ea068bf 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1309,6 +1309,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 ->