diff options
author | Erlang/OTP <[email protected]> | 2018-07-20 14:09:36 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2018-07-20 14:09:36 +0200 |
commit | c836bcd577762cef4b8475a7b6ad1bdf7aba9332 (patch) | |
tree | 71e46fd9f05bbb08485b40a3bc7eab1d5eaedefb /lib/ssl/test | |
parent | 4f5729d3d2618e07d6e23dacbdcd57e2b51fc113 (diff) | |
parent | dcd0547dd2e1a78f89dced3ca5918ae539b11de3 (diff) | |
download | otp-c836bcd577762cef4b8475a7b6ad1bdf7aba9332.tar.gz otp-c836bcd577762cef4b8475a7b6ad1bdf7aba9332.tar.bz2 otp-c836bcd577762cef4b8475a7b6ad1bdf7aba9332.zip |
Merge branch 'ingela/ssl/engine-vs-certfile/ERLERL-211/OTP-15193' into maint-20
* ingela/ssl/engine-vs-certfile/ERLERL-211/OTP-15193:
ssl: Engine key trumps certfile option
Diffstat (limited to 'lib/ssl/test')
-rw-r--r-- | lib/ssl/test/ssl_engine_SUITE.erl | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_engine_SUITE.erl b/lib/ssl/test/ssl_engine_SUITE.erl index 71891356e8..8025e4e0ed 100644 --- a/lib/ssl/test/ssl_engine_SUITE.erl +++ b/lib/ssl/test/ssl_engine_SUITE.erl @@ -117,8 +117,23 @@ private_key(Config) when is_list(Config) -> EngineServerConf = [{key, #{algorithm => rsa, engine => Engine, key_id => ServerKey}} | proplists:delete(key, ServerConf)], + + EngineFileClientConf = [{key, #{algorithm => rsa, + engine => Engine, + key_id => ClientKey}} | + proplists:delete(keyfile, FileClientConf)], + + EngineFileServerConf = [{key, #{algorithm => rsa, + engine => Engine, + key_id => ServerKey}} | + proplists:delete(keyfile, FileServerConf)], + %% Test with engine test_tls_connection(EngineServerConf, EngineClientConf, Config), + + %% Test with engine and present file arugments + test_tls_connection(EngineFileServerConf, EngineFileClientConf, Config), + %% Test that sofware fallback is available test_tls_connection(ServerConf, [{reuse_sessions, false} |ClientConf], Config). |