aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-05-11 09:55:58 +0200
committerIngela Anderton Andin <[email protected]>2017-05-11 09:55:58 +0200
commitc23d7ad97889589dd5ac890626af65840ea60c99 (patch)
treea4e233e7698f0962e2b26d5a8a6d7fd658054e0b /lib/ssl
parentb7a5e0e9070adcd3bd14b8315caa3007b7d2e89f (diff)
parentd12052519312e9f4e3bb189e57322e3097497105 (diff)
downloadotp-c23d7ad97889589dd5ac890626af65840ea60c99.tar.gz
otp-c23d7ad97889589dd5ac890626af65840ea60c99.tar.bz2
otp-c23d7ad97889589dd5ac890626af65840ea60c99.zip
Merge branch 'ingela/ssl/windows-cuddle'
* ingela/ssl/windows-cuddle: ssl: Only run sslv2 reject tests on old OpenSSL version ssl: Try to workaround OpenSSL windows obscurities
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/test/ssl_test_lib.erl14
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index be9849b9e6..68a99c28dd 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1394,6 +1394,18 @@ portable_open_port(Exe, Args) ->
open_port({spawn_executable, AbsPath},
[{args, Args}, stderr_to_stdout]).
+supports_ssl_tls_version(sslv2 = Version) ->
+ case os:cmd("openssl version") of
+ "OpenSSL 1" ++ _ ->
+ false;
+ _ ->
+ VersionFlag = version_flag(Version),
+ Exe = "openssl",
+ Args = ["s_client", VersionFlag],
+ Port = ssl_test_lib:portable_open_port(Exe, Args),
+ do_supports_ssl_tls_version(Port)
+ end;
+
supports_ssl_tls_version(Version) ->
VersionFlag = version_flag(Version),
Exe = "openssl",
@@ -1403,6 +1415,8 @@ supports_ssl_tls_version(Version) ->
do_supports_ssl_tls_version(Port) ->
receive
+ {Port, {data, "u"}} ->
+ false;
{Port, {data, "unknown option" ++ _}} ->
false;
{Port, {data, Data}} ->