aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh_connection_handler.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-02-06 11:23:53 +0100
committerIngela Anderton Andin <[email protected]>2012-02-10 15:34:28 +0100
commitf5f4a7015569dd5bbd7114d89a370ea1bed09023 (patch)
tree9f7206379482af18d681246739623df97eefbe47 /lib/ssh/src/ssh_connection_handler.erl
parentc957dbd73a69a34662c9fdfb45edaa53cb089c45 (diff)
downloadotp-f5f4a7015569dd5bbd7114d89a370ea1bed09023.tar.gz
otp-f5f4a7015569dd5bbd7114d89a370ea1bed09023.tar.bz2
otp-f5f4a7015569dd5bbd7114d89a370ea1bed09023.zip
Cleaned up code so that ssh_file can become a template for a documented
ssh_keys behavior
Diffstat (limited to 'lib/ssh/src/ssh_connection_handler.erl')
-rw-r--r--lib/ssh/src/ssh_connection_handler.erl6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index a9bf23953d..9079089d5d 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -684,16 +684,14 @@ supported_host_keys(server, KeyCb, Options) ->
["ssh-dss", "ssh-rsa"]).
available_host_key(KeyCb, "ssh-dss"= Alg, Opts) ->
- Scope = proplists:get_value(key_scope, Opts, system),
- case KeyCb:private_host_dsa_key(Scope, Opts) of
+ case KeyCb:host_key('ssh-dss', Opts) of
{ok, _} ->
Alg;
Other ->
Other
end;
available_host_key(KeyCb, "ssh-rsa" = Alg, Opts) ->
- Scope = proplists:get_value(key_scope, Opts, system),
- case KeyCb:private_host_rsa_key(Scope, Opts) of
+ case KeyCb:host_key('ssh-rsa', Opts) of
{ok, _} ->
Alg;
Other ->