diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-01-04 10:27:48 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-01-14 18:03:12 +0100 |
| commit | 2a8db059eaee7e3c01a4058cde2dffecb230226b (patch) | |
| tree | e98573252973ae39259ff33bcb659b25e8a2c000 /lib/ssl/test/ssl_pem_cache_SUITE.erl | |
| parent | c27e37d5c37b1edb81f9521b96bdd996ca25653b (diff) | |
| download | otp-2a8db059eaee7e3c01a4058cde2dffecb230226b.tar.gz otp-2a8db059eaee7e3c01a4058cde2dffecb230226b.tar.bz2 otp-2a8db059eaee7e3c01a4058cde2dffecb230226b.zip | |
ssl: Modernize test suite
Diffstat (limited to 'lib/ssl/test/ssl_pem_cache_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_pem_cache_SUITE.erl | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/ssl/test/ssl_pem_cache_SUITE.erl b/lib/ssl/test/ssl_pem_cache_SUITE.erl index 25d2cb300d..6f11e2bbe8 100644 --- a/lib/ssl/test/ssl_pem_cache_SUITE.erl +++ b/lib/ssl/test/ssl_pem_cache_SUITE.erl @@ -44,11 +44,8 @@ init_per_suite(Config0) -> try crypto:start() of ok -> ssl_test_lib:clean_start(), - %% make rsa certs using oppenssl - {ok, _} = make_certs:all(proplists:get_value(data_dir, Config0), - proplists:get_value(priv_dir, Config0)), - Config1 = ssl_test_lib:make_dsa_cert(Config0), - ssl_test_lib:cert_options(Config1) + %% make rsa certs + ssl_test_lib:make_rsa_cert(Config0) catch _:_ -> {skip, "Crypto did not start"} end. @@ -86,8 +83,8 @@ pem_cleanup() -> [{doc, "Test pem cache invalidate mechanism"}]. pem_cleanup(Config)when is_list(Config) -> process_flag(trap_exit, true), - 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 = @@ -118,8 +115,8 @@ invalid_insert() -> invalid_insert(Config)when is_list(Config) -> process_flag(trap_exit, true), - 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), BadClientOpts = [{cacertfile, "tmp/does_not_exist.pem"} | proplists:delete(cacertfile, ClientOpts)], Server = |