aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-11-30 14:53:03 +0100
committerHans Nilsson <[email protected]>2018-11-30 14:53:03 +0100
commit8756194c4c33d724d00aaa706175693575c9990d (patch)
tree58f9f8be31e10add44ad0814488f2b6997e50fea /lib/ssh
parentdfce5316948c5085e659a9c5fefb10ff8fcdf959 (diff)
parente5ac56c69ca67c2cf6b779bb07bbd922855bc29a (diff)
downloadotp-8756194c4c33d724d00aaa706175693575c9990d.tar.gz
otp-8756194c4c33d724d00aaa706175693575c9990d.tar.bz2
otp-8756194c4c33d724d00aaa706175693575c9990d.zip
Merge branch 'hans/crypto/cuddle_tests' into maint
* hans/crypto/cuddle_tests: crypto: Split function in otp_test_engine crypto: Update test engine with fake rsa support
Diffstat (limited to 'lib/ssh')
-rw-r--r--lib/ssh/test/ssh_engine_SUITE.erl11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/ssh/test/ssh_engine_SUITE.erl b/lib/ssh/test/ssh_engine_SUITE.erl
index c2e6ac1fee..3adb23acdb 100644
--- a/lib/ssh/test/ssh_engine_SUITE.erl
+++ b/lib/ssh/test/ssh_engine_SUITE.erl
@@ -126,10 +126,17 @@ simple_connect(Config) ->
load_engine() ->
case crypto:get_test_engine() of
{ok, Engine} ->
- try crypto:engine_load(<<"dynamic">>,
+ 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">>, Engine},
<<"LOAD">>],
- [])
+ [],
+ Methods
+ )
catch
error:notsup ->
{error, notsup}