aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-11-23 18:05:32 +0100
committerHans Nilsson <[email protected]>2016-11-23 18:05:32 +0100
commitbdf77bb94906b34a9afd4dc9c2161e77512ac9e7 (patch)
tree976f1e23d85e624cd731fc151d5f64fa0c557663 /lib/ssh/src/ssh.erl
parent2eb747187e5882406efc556f44aae29edd8f0847 (diff)
parent2a98b4a2c29b2e2996a2f5095a824c4ab12e2a0b (diff)
downloadotp-bdf77bb94906b34a9afd4dc9c2161e77512ac9e7.tar.gz
otp-bdf77bb94906b34a9afd4dc9c2161e77512ac9e7.tar.bz2
otp-bdf77bb94906b34a9afd4dc9c2161e77512ac9e7.zip
Merge branch 'hans/ssh/hostkey_fingerprint_option/OTP-13887' into maint
Diffstat (limited to 'lib/ssh/src/ssh.erl')
-rw-r--r--lib/ssh/src/ssh.erl9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 1d7be3547b..31e343e81b 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -617,6 +617,15 @@ handle_ssh_option({user_dir_fun, Value} = Opt) when is_function(Value) ->
Opt;
handle_ssh_option({silently_accept_hosts, Value} = Opt) when is_boolean(Value) ->
Opt;
+handle_ssh_option({silently_accept_hosts, Value} = Opt) when is_function(Value,2) ->
+ Opt;
+handle_ssh_option({silently_accept_hosts, {DigestAlg,Value}} = Opt) when is_function(Value,2) ->
+ case lists:member(DigestAlg, [md5, sha, sha224, sha256, sha384, sha512]) of
+ true ->
+ Opt;
+ false ->
+ throw({error, {eoptions, Opt}})
+ end;
handle_ssh_option({user_interaction, Value} = Opt) when is_boolean(Value) ->
Opt;
handle_ssh_option({preferred_algorithms,[_|_]} = Opt) ->