aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-11-30 14:53:56 +0100
committerHans Nilsson <[email protected]>2018-11-30 14:53:56 +0100
commit8ca061c3006ad69c2a8d1c835d0d678438966dfc (patch)
tree7733b02d291d44b66120acbe1baad612006aebe6 /lib/ssl
parentae799c9de1b24d7def2a84172a5740ac9a5d6595 (diff)
parent8756194c4c33d724d00aaa706175693575c9990d (diff)
downloadotp-8ca061c3006ad69c2a8d1c835d0d678438966dfc.tar.gz
otp-8ca061c3006ad69c2a8d1c835d0d678438966dfc.tar.bz2
otp-8ca061c3006ad69c2a8d1c835d0d678438966dfc.zip
Merge branch 'maint'
* maint: crypto: Split function in otp_test_engine crypto: Update test engine with fake rsa support Correct typo in logger formatter docs
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/test/ssl_engine_SUITE.erl15
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_engine_SUITE.erl b/lib/ssl/test/ssl_engine_SUITE.erl
index e6c82d3eb5..a39a62e550 100644
--- a/lib/ssl/test/ssl_engine_SUITE.erl
+++ b/lib/ssl/test/ssl_engine_SUITE.erl
@@ -46,10 +46,17 @@ init_per_suite(Config) ->
ssl_test_lib:clean_start(),
case crypto:get_test_engine() of
{ok, EngineName} ->
- try crypto:engine_load(<<"dynamic">>,
- [{<<"SO_PATH">>, EngineName},
- <<"LOAD">>],
- []) of
+ try
+ %% The test engine has it's own fake rsa sign/verify that
+ %% you don't want to use, so exclude it from methods to load:
+ Methods =
+ crypto:engine_get_all_methods() -- [engine_method_rsa],
+ crypto:engine_load(<<"dynamic">>,
+ [{<<"SO_PATH">>, EngineName},
+ <<"LOAD">>],
+ [],
+ Methods)
+ of
{ok, Engine} ->
[{engine, Engine} |Config];
{error, Reason} ->