aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-07-24 08:50:32 +0200
committerJohn Högberg <[email protected]>2018-07-24 08:50:32 +0200
commit958ad184c843ce32497eef319f10db7a3a3759c2 (patch)
tree88a0ef27657e3f8eb0a1a85a7019139220247b2a /lib/ssl/test
parent408352c6c2c484c6100a02d86f163d2dc814f542 (diff)
parent107c492a5e3ebe315d68f9438191f2b0c2d37e5b (diff)
downloadotp-958ad184c843ce32497eef319f10db7a3a3759c2.tar.gz
otp-958ad184c843ce32497eef319f10db7a3a3759c2.tar.bz2
otp-958ad184c843ce32497eef319f10db7a3a3759c2.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Prepare release ssl: Engine key trumps certfile option inets: Prepare for release inets: Improve error handling
Diffstat (limited to 'lib/ssl/test')
-rw-r--r--lib/ssl/test/ssl_engine_SUITE.erl15
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 7277dad012..1423c99dc2 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).