From f5f4a7015569dd5bbd7114d89a370ea1bed09023 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Mon, 6 Feb 2012 11:23:53 +0100 Subject: Cleaned up code so that ssh_file can become a template for a documented ssh_keys behavior --- lib/ssh/src/ssh_connection_handler.erl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lib/ssh/src/ssh_connection_handler.erl') 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 -> -- cgit v1.2.3