From 647ef86cd72d5646eda0901f59a68e3bd4878a9f Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Thu, 2 Feb 2012 14:14:16 +0100
Subject: Ssh daemon handles RSA host keys

Solves OTP-7677
---
 lib/ssh/src/ssh_connection_handler.erl | 47 +++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 6 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 00b30e5434..a9bf23953d 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -637,16 +637,18 @@ init_ssh(client = Role, Vsn, Version, Options, Socket) ->
     {ok, PeerAddr} = inet:peername(Socket),
     
     PeerName =  proplists:get_value(host, Options),
+    KeyCb =  proplists:get_value(key_cb, Options, ssh_file),
 
     #ssh{role = Role,
 	 c_vsn = Vsn,
 	 c_version = Version,
-	 key_cb = proplists:get_value(key_cb, Options, ssh_file),
+	 key_cb = KeyCb,
 	 io_cb = IOCb,
 	 userauth_quiet_mode = proplists:get_value(quiet_mode, Options, false),
 	 opts = Options,
 	 userauth_supported_methods = AuthMethods,
-	 peer = {PeerName, PeerAddr}
+	 peer = {PeerName, PeerAddr},
+	 available_host_keys = supported_host_keys(Role, KeyCb, Options)
 	};
 
 init_ssh(server = Role, Vsn, Version, Options, Socket) ->
@@ -654,17 +656,50 @@ init_ssh(server = Role, Vsn, Version, Options, Socket) ->
     AuthMethods = proplists:get_value(auth_methods, Options, 
 				      ?SUPPORTED_AUTH_METHODS),
     {ok, PeerAddr} = inet:peername(Socket),
-    
+    KeyCb =  proplists:get_value(key_cb, Options, ssh_file),
+
     #ssh{role = Role,
 	 s_vsn = Vsn,
 	 s_version = Version,
-	 key_cb = proplists:get_value(key_cb, Options, ssh_file),
+	 key_cb = KeyCb,
 	 io_cb = proplists:get_value(io_cb, Options, ssh_io),
 	 opts = Options,
 	 userauth_supported_methods = AuthMethods,
-	 peer = {undefined, PeerAddr}
+	 peer = {undefined, PeerAddr},
+	 available_host_keys = supported_host_keys(Role, KeyCb, Options)
 	 }.
 
+supported_host_keys(client, _, _) ->
+    ["ssh-rsa", "ssh-dss"];
+supported_host_keys(server, KeyCb, Options) ->
+    lists:foldl(fun(Type, Acc) ->
+			case available_host_key(KeyCb, Type, Options) of
+			    {error, _} ->
+				Acc;
+			    Alg ->
+				[Alg | Acc]
+			end
+		end, [],
+		%% Prefered alg last so no need to reverse
+		["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
+	{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
+	{ok, _} ->
+	    Alg;
+	Other ->
+	    Other
+    end.
+
 send_msg(Msg, #state{socket = Socket, transport_cb = Transport}) ->
     Transport:send(Socket, Msg).
 
-- 
cgit v1.2.3