ssh: Merge connection_manager and connection_handler processes

Also start adding dialyzer specs and removing dead code

1 files changed, 24 insertions, 71 deletions

diff --git a/lib/ssh/src/ssh_auth.erl b/lib/ssh/src/ssh_auth.erl
index f3d1a711ae..1fa3df847f 100644
--- a/lib/ssh/src/ssh_auth.erl
+++ b/lib/ssh/src/ssh_auth.erl
@@ -31,7 +31,6 @@
 	 service_request_msg/1, init_userauth_request_msg/1,
 	 userauth_request_msg/1, handle_userauth_request/3,
 	 handle_userauth_info_request/3, handle_userauth_info_response/2
-	 %%userauth_messages/0
 	]).
 
 %%--------------------------------------------------------------------
@@ -43,7 +42,6 @@ publickey_msg([Alg, #ssh{user = User,
 		       opts = Opts} = Ssh]) ->
 
     Hash = sha, %% Maybe option?!
-    %%ssh_bits:install_messages(userauth_pk_messages()),
     KeyCb = proplists:get_value(key_cb, Opts, ssh_file),
 
     case KeyCb:user_key(Alg, Opts) of
@@ -69,7 +67,6 @@ publickey_msg([Alg, #ssh{user = User,
 
 password_msg([#ssh{opts = Opts, io_cb = IoCb,
 		   user = User, service = Service} = Ssh]) ->
-    %%ssh_bits:install_messages(userauth_passwd_messages()),
     Password = case proplists:get_value(password, Opts) of
 		   undefined -> 
 		       user_interaction(IoCb, Ssh);
@@ -99,7 +96,6 @@ user_interaction(IoCb, Ssh) ->
 %% See RFC 4256 for info on keyboard-interactive
 keyboard_interactive_msg([#ssh{user = User,
 			       service = Service} = Ssh]) ->
-    %%ssh_bits:install_messages(userauth_keyboard_interactive_messages()),
     ssh_transport:ssh_packet(
       #ssh_msg_userauth_request{user = User,
 				service = Service,
@@ -239,7 +235,6 @@ handle_userauth_request(#ssh_msg_userauth_request{user = User,
 			     partial_success = false}, Ssh)}
 	    end;
 	?FALSE ->
-	    %%ssh_bits:install_messages(userauth_pk_messages()),
 	    {not_authorized, {User, undefined},
 	     ssh_transport:ssh_packet(
 	       #ssh_msg_userauth_pk_ok{algorithm_name = Alg,
@@ -275,26 +270,10 @@ handle_userauth_info_request(
 handle_userauth_info_response(#ssh_msg_userauth_info_response{},
 			      _Auth) ->
     throw(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
-			      description = "Server does not support" 
-			      "keyboard-interactive", 
+			      description = "Server does not support"
+			      "keyboard-interactive",
 			      language = "en"}).
-%% userauth_messages() ->
-%%     [ {ssh_msg_userauth_request, ?SSH_MSG_USERAUTH_REQUEST,
-%%        [string,
-%% 	string,
-%% 	string,
-%% 	'...']},
-
-%%       {ssh_msg_userauth_failure, ?SSH_MSG_USERAUTH_FAILURE,
-%%        [string,
-%% 	boolean]},
-
-%%       {ssh_msg_userauth_success, ?SSH_MSG_USERAUTH_SUCCESS,
-%%        []},
-
-%%       {ssh_msg_userauth_banner, ?SSH_MSG_USERAUTH_BANNER,
-%%        [string,
-%% 	string]}].
+
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
@@ -386,13 +365,8 @@ algorithm_string('ssh-rsa') ->
 algorithm_string('ssh-dss') ->
      "ssh-dss".
 
-decode_keyboard_interactive_prompts(NumPrompts, Data) ->
-    Types = lists:append(lists:duplicate(NumPrompts, [string, boolean])),
-    pairwise_tuplify(ssh_bits:decode(Data, Types)).
-
-pairwise_tuplify([E1, E2 | Rest]) -> [{E1, E2} | pairwise_tuplify(Rest)];
-pairwise_tuplify([])              -> [].
-    
+decode_keyboard_interactive_prompts(_NumPrompts, Data) ->
+    ssh_message:decode_keyboard_interactive_prompts(Data, []).
 
 keyboard_interact_get_responses(IoCb, Opts, Name, Instr, PromptInfos) ->
     NumPrompts = length(PromptInfos),
@@ -431,50 +405,29 @@ keyboard_interact(IoCb, Name, Instr, Prompts, Opts) ->
 	      end,
 	      Prompts).
 
-%% userauth_passwd_messages() ->
-%%     [
-%%       {ssh_msg_userauth_passwd_changereq, ?SSH_MSG_USERAUTH_PASSWD_CHANGEREQ,
-%%        [string,
-%% 	string]}
-%%      ].
-
-%% userauth_keyboard_interactive_messages() ->
-%%     [ {ssh_msg_userauth_info_request, ?SSH_MSG_USERAUTH_INFO_REQUEST,
-%%        [string,
-%% 	string,
-%% 	string,
-%% 	uint32,
-%% 	'...']},
-
-     %%  {ssh_msg_userauth_info_response, ?SSH_MSG_USERAUTH_INFO_RESPONSE,
-     %%   [uint32,
-     %% 	'...']}
-     %% ].
-
-%% userauth_pk_messages() ->
-%%     [ {ssh_msg_userauth_pk_ok, ?SSH_MSG_USERAUTH_PK_OK,
-%%        [string, % algorithm name
-%% 	binary]} % key blob
-%%      ].
-
 other_alg('ssh-rsa') ->
     'ssh-dss';
 other_alg('ssh-dss') ->
     'ssh-rsa'.
-decode_public_key_v2(K_S, "ssh-rsa") ->
-    case ssh_bits:decode(K_S,[string,mpint,mpint]) of
-	["ssh-rsa", E, N] ->
-	    {ok, #'RSAPublicKey'{publicExponent = E, modulus = N}};
-	_ ->
-	    {error, bad_format}
-    end;
-decode_public_key_v2(K_S, "ssh-dss") ->
-     case ssh_bits:decode(K_S,[string,mpint,mpint,mpint,mpint]) of
-	 ["ssh-dss",P,Q,G,Y] ->
-	     {ok, {Y, #'Dss-Parms'{p = P, q = Q, g = G}}};
-	 _ ->
-	     {error, bad_format}
-     end;
+decode_public_key_v2(<<?UINT32(Len0), _:Len0/binary,
+		       ?UINT32(Len1), BinE:Len1/binary,
+		       ?UINT32(Len2), BinN:Len2/binary>>
+			 ,"ssh-rsa") ->
+    E = ssh_bits:erlint(Len1, BinE),
+    N = ssh_bits:erlint(Len2, BinN),
+    {ok, #'RSAPublicKey'{publicExponent = E, modulus = N}};
+decode_public_key_v2(<<?UINT32(Len0), _:Len0/binary,
+		       ?UINT32(Len1), BinP:Len1/binary,
+		       ?UINT32(Len2), BinQ:Len2/binary,
+		       ?UINT32(Len3), BinG:Len3/binary,
+		       ?UINT32(Len4), BinY:Len4/binary>>
+			 , "ssh-dss") ->
+    P = ssh_bits:erlint(Len1, BinP),
+    Q = ssh_bits:erlint(Len2, BinQ),
+    G = ssh_bits:erlint(Len3, BinG),
+    Y = ssh_bits:erlint(Len4, BinY),
+    {ok, {Y, #'Dss-Parms'{p = P, q = Q, g = G}}};
+
 decode_public_key_v2(_, _) ->
     {error, bad_format}.