aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-05-03 11:38:48 +0200
committerIngela Anderton Andin <[email protected]>2018-05-03 11:38:48 +0200
commitf770320ddc583c1059d33ff756ad986b53848517 (patch)
tree94e89c1e3d73639cab8df3412c75859da1c1e9f4 /lib
parent6654d76303a1be3fc8bab368a58e2d0068fad2c0 (diff)
parent1fa53b33bbad7ef6f3500416596a94cdc216b533 (diff)
downloadotp-f770320ddc583c1059d33ff756ad986b53848517.tar.gz
otp-f770320ddc583c1059d33ff756ad986b53848517.tar.bz2
otp-f770320ddc583c1059d33ff756ad986b53848517.zip
Merge branch 'ingela/ssl/testcuddling'
* ingela/ssl/testcuddling: ssl: Exclude DTLS tests for one more OpenSSL version for now ssl: Use sane input data ssl: Make sure help function works from all parts of test suite
Diffstat (limited to 'lib')
-rw-r--r--lib/ssl/test/ssl_basic_SUITE.erl7
-rw-r--r--lib/ssl/test/ssl_test_lib.erl5
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index fe4f02f100..d3b13050e3 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -273,7 +273,8 @@ init_per_suite(Config0) ->
proplists:get_value(priv_dir, Config0)),
Config1 = ssl_test_lib:make_dsa_cert(Config0),
Config2 = ssl_test_lib:make_ecdsa_cert(Config1),
- Config = ssl_test_lib:make_ecdh_rsa_cert(Config2),
+ Config3 = ssl_test_lib:make_rsa_cert(Config2),
+ Config = ssl_test_lib:make_ecdh_rsa_cert(Config3),
ssl_test_lib:cert_options(Config)
catch _:_ ->
{skip, "Crypto did not start"}
@@ -3180,10 +3181,10 @@ der_input(Config) when is_list(Config) ->
Size = ets:info(CADb, size),
- SeverVerifyOpts = ssl_test_lib:ssl_options(server_opts, Config),
+ SeverVerifyOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
{ServerCert, ServerKey, ServerCaCerts, DHParams} = der_input_opts([{dhfile, DHParamFile} |
SeverVerifyOpts]),
- ClientVerifyOpts = ssl_test_lib:ssl_options(client_opts, Config),
+ ClientVerifyOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
{ClientCert, ClientKey, ClientCaCerts, DHParams} = der_input_opts([{dhfile, DHParamFile} |
ClientVerifyOpts]),
ServerOpts = [{verify, verify_peer}, {fail_if_no_peer_cert, true},
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 4022f49077..8c27571d64 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1597,6 +1597,8 @@ openssl_sane_dtls() ->
false;
"OpenSSL 1.0.2n" ++ _ ->
false;
+ "OpenSSL 1.0.2m" ++ _ ->
+ false;
"OpenSSL 1.0.0" ++ _ ->
false;
"OpenSSL" ++ _ ->
@@ -1768,9 +1770,12 @@ supports_ssl_tls_version(sslv2 = Version) ->
VersionFlag = version_flag(Version),
Exe = "openssl",
Args = ["s_client", VersionFlag],
+ [{trap_exit, Trap}] = process_info(self(), [trap_exit]),
+ process_flag(trap_exit, true),
Port = ssl_test_lib:portable_open_port(Exe, Args),
Bool = do_supports_ssl_tls_version(Port, ""),
consume_port_exit(Port),
+ process_flag(trap_exit, Trap),
Bool
end;