diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-01-15 15:36:53 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-01-15 15:36:53 +0100 |
| commit | a9b0c987fc6fc6ba11a3db523e4b8afb79c1b69f (patch) | |
| tree | 865c153a245a706c2c8a77d64262a4a63fc3f1fa /lib/ssl/test/ssl_pem_cache_SUITE.erl | |
| parent | 39b4b728d5950a9c4db5bb2551919af1d8811a21 (diff) | |
| parent | acc4f00fe4b3c66738aaf3f58951dbf0a96b174c (diff) | |
| download | otp-a9b0c987fc6fc6ba11a3db523e4b8afb79c1b69f.tar.gz otp-a9b0c987fc6fc6ba11a3db523e4b8afb79c1b69f.tar.bz2 otp-a9b0c987fc6fc6ba11a3db523e4b8afb79c1b69f.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/src/ssl.erl
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 = |