diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-04-01 15:07:26 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-04-02 14:54:49 +0200 |
| commit | 3a36a6324841f9fc305fc713674184d76f98f9a1 (patch) | |
| tree | 1dd8d7e9bbd7e48623b0efb3b22902f872d2c745 /lib/ssl/test | |
| parent | d7a825fdf0fc63cff67bd35d35c1a6de7c533e55 (diff) | |
| download | otp-3a36a6324841f9fc305fc713674184d76f98f9a1.tar.gz otp-3a36a6324841f9fc305fc713674184d76f98f9a1.tar.bz2 otp-3a36a6324841f9fc305fc713674184d76f98f9a1.zip | |
ssl: Upgrade cert generation for upgrade test
Diffstat (limited to 'lib/ssl/test')
| -rw-r--r-- | lib/ssl/test/ssl_upgrade_SUITE.erl | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/ssl/test/ssl_upgrade_SUITE.erl b/lib/ssl/test/ssl_upgrade_SUITE.erl index 875399db76..ead18aeb73 100644 --- a/lib/ssl/test/ssl_upgrade_SUITE.erl +++ b/lib/ssl/test/ssl_upgrade_SUITE.erl @@ -47,10 +47,7 @@ init_per_suite(Config0) -> {skip, Reason} -> {skip, Reason}; Config -> - Result = - {ok, _} = make_certs:all(proplists:get_value(data_dir, Config), - proplists:get_value(priv_dir, Config)), - ssl_test_lib:cert_options(Config) + ssl_test_lib:make_rsa_cert(Config) end catch _:_ -> {skip, "Crypto did not start"} @@ -149,8 +146,8 @@ use_connection(Socket) -> end. soft_start_connection(Config, ResulProxy) -> - ClientOpts = proplists:get_value(client_verification_opts, Config), - ServerOpts = proplists:get_value(server_verification_opts, Config), + ClientOpts = proplists:get_value(client_rsa_verify_opts, Config), + ServerOpts = proplists:get_value(server_rsa_verify_opts, Config), {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), Server = start_server([{node, ServerNode}, {port, 0}, {from, ResulProxy}, @@ -166,8 +163,8 @@ soft_start_connection(Config, ResulProxy) -> {Server, Client}. restart_start_connection(Config, ResulProxy) -> - ClientOpts = proplists:get_value(client_verification_opts, Config), - ServerOpts = proplists:get_value(server_verification_opts, Config), + ClientOpts = proplists:get_value(client_rsa_verify_opts, Config), + ServerOpts = proplists:get_value(server_rsa_verify_opts, Config), {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), Server = start_server([{node, ServerNode}, {port, 0}, {from, ResulProxy}, |