diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2018-05-02 16:04:42 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2018-05-02 16:36:27 +0200 |
| commit | 964b2afcb1ef77e883b9d5e1013bb7cb834e3451 (patch) | |
| tree | 911c901f425c72d715b6a56c2f30abd7aad3cd88 | |
| parent | b869182dbf69d97389c364f7ba75233fc08058fd (diff) | |
| download | erlang-964b2afcb1ef77e883b9d5e1013bb7cb834e3451.tar.gz | |
ssl: Use sane input data
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 7 |
1 files changed, 4 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}, |