Merge branch 'maint'

10 files changed, 350 insertions, 23 deletions

diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
index 53c755d3cb..90d71107ad 100644
--- a/lib/ssh/src/Makefile
+++ b/lib/ssh/src/Makefile
@@ -65,6 +65,7 @@ MODULES= \
 	ssh_cli \
 	ssh_file \
 	ssh_io \
+	ssh_info \
 	ssh_math \
 	ssh_message \
 	ssh_no_io \
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index e0a51b3574..4ad55b34ca 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -23,6 +23,7 @@
 	     sshd_sup,
 	     ssh_file,
 	     ssh_io,
+	     ssh_info,
 	     ssh_math,
 	     ssh_no_io,
              ssh_server_key_api,
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 42603cc23c..600c01454c 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,7 +19,22 @@
 
 {"%VSN%",	
  [
+  {"3.0.7", [{load_module, ssh_auth, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_acceptor, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_channel, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_connection, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
+	     {load_module, ssh_info, soft_purge, soft_purge, []},
+	     {load_module, ssh_message, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_io, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_sftp, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_xfer, soft_purge, soft_purge, [ssh_connection_handler]}]},
   {"3.0.6", [{load_module, ssh_auth, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_acceptor, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_channel, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_connection, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
+	     {load_module, ssh_info, soft_purge, soft_purge, []},
 	     {load_module, ssh_message, soft_purge, soft_purge, [ssh_connection_handler]},
 	     {load_module, ssh_io, soft_purge, soft_purge, [ssh_connection_handler]},
 	     {load_module, ssh_sftp, soft_purge, soft_purge, [ssh_connection_handler]},
@@ -27,7 +42,22 @@
   {<<".*">>, [{restart_application, ssh}]}
  ],
  [
+  {"3.0.7", [{load_module, ssh_auth, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_acceptor, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_channel, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_connection, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
+	     {load_module, ssh_info, soft_purge, soft_purge, []},
+	     {load_module, ssh_message, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_io, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_sftp, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_xfer, soft_purge, soft_purge, [ssh_connection_handler]}]},
   {"3.0.6", [{load_module, ssh_auth, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_acceptor, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_channel, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_connection, soft_purge, soft_purge, [ssh_connection_handler]},
+	     {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
+	     {load_module, ssh_info, soft_purge, soft_purge, []},
 	     {load_module, ssh_message, soft_purge, soft_purge, [ssh_connection_handler]},
 	     {load_module, ssh_io, soft_purge, soft_purge, [ssh_connection_handler]},
 	     {load_module, ssh_sftp, soft_purge, soft_purge, [ssh_connection_handler]},
diff --git a/lib/ssh/src/ssh_acceptor.erl b/lib/ssh/src/ssh_acceptor.erl
index 7302196674..6c443eeb9c 100644
--- a/lib/ssh/src/ssh_acceptor.erl
+++ b/lib/ssh/src/ssh_acceptor.erl
@@ -22,7 +22,8 @@
 -module(ssh_acceptor).
 
 %% Internal application API
--export([start_link/5]).
+-export([start_link/5,
+	 number_of_connections/1]).
 
 %% spawn export  
 -export([acceptor_init/6, acceptor_loop/6]).
@@ -140,5 +141,6 @@ handle_error(Reason) ->
 number_of_connections(SystemSup) ->
     length([X || 
 	       {R,X,supervisor,[ssh_subsystem_sup]} <- supervisor:which_children(SystemSup),
+	       is_pid(X),
 	       is_reference(R)
 	  ]).
diff --git a/lib/ssh/src/ssh_auth.erl b/lib/ssh/src/ssh_auth.erl
index b4d406ba8d..45c4d52d7e 100644
--- a/lib/ssh/src/ssh_auth.erl
+++ b/lib/ssh/src/ssh_auth.erl
@@ -184,9 +184,8 @@ handle_userauth_request(#ssh_msg_service_request{name =
 handle_userauth_request(#ssh_msg_userauth_request{user = User,
 						  service = "ssh-connection",
 						  method = "password",
-						  data = Data}, _, 
+						  data = <<?FALSE, ?UINT32(Sz), BinPwd:Sz/binary>>}, _, 
 			#ssh{opts = Opts} = Ssh) ->
-    <<_:8, ?UINT32(Sz), BinPwd:Sz/binary>> = Data,
     Password = unicode:characters_to_list(BinPwd),
     case check_password(User, Password, Opts) of
 	true ->
@@ -201,6 +200,27 @@ handle_userauth_request(#ssh_msg_userauth_request{user = User,
 
 handle_userauth_request(#ssh_msg_userauth_request{user = User,
 						  service = "ssh-connection",
+						  method = "password",
+						  data = <<?TRUE,
+							   _/binary
+							   %% ?UINT32(Sz1), OldBinPwd:Sz1/binary,
+							   %% ?UINT32(Sz2), NewBinPwd:Sz2/binary
+							 >>
+						 }, _, 
+			Ssh) ->
+    %% Password change without us having sent SSH_MSG_USERAUTH_PASSWD_CHANGEREQ (because we never do)
+    %% RFC 4252 says:
+    %%   SSH_MSG_USERAUTH_FAILURE without partial success - The password
+    %%   has not been changed.  Either password changing was not supported,
+    %%   or the old password was bad. 
+
+    {not_authorized, {User, {error,"Password change not supported"}}, 
+     ssh_transport:ssh_packet(#ssh_msg_userauth_failure{
+				 authentications = "",
+				 partial_success = false}, Ssh)};
+
+handle_userauth_request(#ssh_msg_userauth_request{user = User,
+						  service = "ssh-connection",
 						  method = "none"}, _,
 			#ssh{userauth_supported_methods = Methods} = Ssh) ->
     {not_authorized, {User, undefined},
diff --git a/lib/ssh/src/ssh_channel.erl b/lib/ssh/src/ssh_channel.erl
index 508ae637cf..5c24f362b1 100644
--- a/lib/ssh/src/ssh_channel.erl
+++ b/lib/ssh/src/ssh_channel.erl
@@ -67,7 +67,8 @@
 %% Internal application API
 -export([cache_create/0, cache_lookup/2, cache_update/2, 
 	 cache_delete/1, cache_delete/2,  cache_foldl/3,
-	 cache_find/2]).
+	 cache_find/2,
+	 get_print_info/1]).
 
 -record(state, {
 	  cm,
@@ -190,6 +191,14 @@ init([Options]) ->
 %%                                      {stop, Reason, State}
 %% Description: Handling call messages
 %%--------------------------------------------------------------------
+handle_call(get_print_info, _From, State) ->
+    Reply =
+	{{State#state.cm,
+	  State#state.channel_id},
+	 io_lib:format('CB=~p',[State#state.channel_cb])
+	},
+    {reply, Reply, State};
+
 handle_call(Request, From, #state{channel_cb = Module, 
 				  channel_state = ChannelState} = State) ->
    try Module:handle_call(Request, From, ChannelState) of
@@ -333,6 +342,9 @@ cache_find(ChannelPid, Cache) ->
 	   Channel
    end.
 
+get_print_info(Pid) ->
+    call(Pid, get_print_info, 1000).
+
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index 87f37b93ef..f3ff9ae67a 100644
--- a/lib/ssh/src/ssh_connection.erl
+++ b/lib/ssh/src/ssh_connection.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. 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
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 4fbc5d0ae2..fa107be1b1 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -41,11 +41,13 @@
 	 global_request/4, send/5, send_eof/2, info/1, info/2,
 	 connection_info/2, channel_info/3,
 	 adjust_window/3, close/2, stop/1, renegotiate/1, renegotiate_data/1,
-	 start_connection/4]).
+	 start_connection/4,
+	 get_print_info/1]).
 
 %% gen_fsm callbacks
 -export([hello/2, kexinit/2, key_exchange/2, new_keys/2,
-	 userauth/2, connected/2]).
+	 userauth/2, connected/2,
+	 error/2]).
 
 -export([init/1, handle_event/3,
 	 handle_sync_event/4, handle_info/3, terminate/3, format_status/2, code_change/4]).
@@ -171,9 +173,23 @@ init([Role, Socket, SshOpts]) ->
 			       State#state{ssh_params = Ssh})
     catch
 	_:Error ->
-	    gen_fsm:enter_loop(?MODULE, [], error, {Error, State0})
+	    gen_fsm:enter_loop(?MODULE, [], error, {Error, State})
     end.
 
+%% Temporary fix for the Nessus error.  SYN->   <-SYNACK  ACK->  RST-> ?
+error(_Event, {Error,State=#state{}}) ->
+    case Error of
+	{badmatch,{error,enotconn}} ->
+	    %% {error,enotconn} probably from inet:peername in
+	    %% init_ssh(server,..)/5 called from init/1
+	    {stop, {shutdown,"TCP connenction to server was prematurely closed by the client"}, State};
+	_ ->
+	    {stop, {shutdown,{init,Error}}, State}
+    end;
+error(Event, State) -> 
+    %% State deliberately not checked beeing #state. This is a panic-clause...
+    {stop, {shutdown,{init,{spurious_error,Event}}}, State}.
+
 %%--------------------------------------------------------------------
 -spec open_channel(pid(), string(), iodata(), integer(), integer(),
 		   timeout()) -> {open, channel_id()} | {error, term()}.
@@ -240,6 +256,9 @@ send_eof(ConnectionHandler, ChannelId) ->
 %%--------------------------------------------------------------------
 -spec connection_info(pid(), [atom()]) -> proplists:proplist().
 %%--------------------------------------------------------------------
+get_print_info(ConnectionHandler) ->
+    sync_send_all_state_event(ConnectionHandler, get_print_info, 1000).
+
 connection_info(ConnectionHandler, Options) ->
     sync_send_all_state_event(ConnectionHandler, {connection_info, Options}).
 
@@ -550,7 +569,7 @@ connected({#ssh_msg_kexinit{}, _Payload} = Event, State) ->
 
 %%--------------------------------------------------------------------
 handle_event(#ssh_msg_disconnect{description = Desc} = DisconnectMsg, _StateName, #state{} = State) ->
-    handle_disconnect(DisconnectMsg, State),
+    handle_disconnect(peer, DisconnectMsg, State),
     {stop, {shutdown, Desc}, State};
 
 handle_event(#ssh_msg_ignore{}, StateName, State) ->
@@ -758,6 +777,20 @@ handle_sync_event({recv_window, ChannelId}, _From, StateName,
 	    end,
     {reply, Reply, StateName, next_packet(State)};
 
+handle_sync_event(get_print_info, _From, StateName, State) ->
+    Reply =
+	try
+	    {inet:sockname(State#state.socket),
+	     inet:peername(State#state.socket)
+	    }
+	of
+	    {{ok,Local}, {ok,Remote}} -> {{Local,Remote},io_lib:format("statename=~p",[StateName])};
+	    _ -> {{"-",0},"-"}
+	catch
+	    _:_ -> {{"?",0},"?"}
+	end,
+    {reply, Reply, StateName, State};
+
 handle_sync_event({connection_info, Options}, _From, StateName, State) ->
     Info = ssh_info(Options, State, []),
     {reply, Info, StateName, State};
@@ -936,6 +969,10 @@ terminate(normal, _, #state{transport_cb = Transport,
     (catch Transport:close(Socket)),
     ok;
 
+terminate({shutdown,{init,Reason}}, StateName, State) ->
+    error_logger:info_report(io_lib:format("Erlang ssh in connection handler init: ~p~n",[Reason])),
+    terminate(normal, StateName, State);
+
 %% Terminated by supervisor
 terminate(shutdown, StateName, #state{ssh_params = Ssh0} = State) ->
     DisconnectMsg = 
@@ -951,8 +988,10 @@ terminate({shutdown, #ssh_msg_disconnect{} = Msg}, StateName,
      {SshPacket, Ssh} = ssh_transport:ssh_packet(Msg, Ssh0),
     send_msg(SshPacket, State),
      terminate(normal, StateName, State#state{ssh_params = Ssh});
+
 terminate({shutdown, _}, StateName, State) ->
     terminate(normal, StateName, State);
+
 terminate(Reason, StateName, #state{ssh_params = Ssh0, starter = _Pid,
 				   connection_state = Connection} = State) ->
     terminate_subsytem(Connection),
@@ -965,6 +1004,7 @@ terminate(Reason, StateName, #state{ssh_params = Ssh0, starter = _Pid,
     send_msg(SshPacket, State),
     terminate(normal, StateName, State#state{ssh_params = Ssh}).
 
+
 terminate_subsytem(#connection{system_supervisor = SysSup,
 			       sub_system_supervisor = SubSysSup}) when is_pid(SubSysSup) ->
     ssh_system_sup:stop_subsystem(SysSup, SubSysSup);
@@ -1161,7 +1201,10 @@ send_all_state_event(FsmPid, Event) ->
     gen_fsm:send_all_state_event(FsmPid, Event).
 
 sync_send_all_state_event(FsmPid, Event) ->
-    try gen_fsm:sync_send_all_state_event(FsmPid, Event, infinity)
+    sync_send_all_state_event(FsmPid, Event, infinity).
+
+sync_send_all_state_event(FsmPid, Event, Timeout) ->
+    try gen_fsm:sync_send_all_state_event(FsmPid, Event, Timeout)
     catch
 	exit:{noproc, _} ->
 	    {error, closed};
@@ -1258,13 +1301,23 @@ generate_event(<<?BYTE(Byte), _/binary>> = Msg, StateName,
 generate_event(Msg, StateName, State0, EncData) ->
     Event = ssh_message:decode(Msg),
     State = generate_event_new_state(State0, EncData),
-    case Event of
-	#ssh_msg_kexinit{} ->
-	    %% We need payload for verification later.
-	    event({Event, Msg}, StateName, State);
-	_ ->
-	    event(Event, StateName, State)
-    end.
+    try 
+	case Event of
+	    #ssh_msg_kexinit{} ->
+		%% We need payload for verification later.
+		event({Event, Msg}, StateName, State);
+	    _ ->
+		event(Event, StateName, State)
+	end
+    catch 
+	_:_  ->
+	    DisconnectMsg =
+		#ssh_msg_disconnect{code = ?SSH_DISCONNECT_PROTOCOL_ERROR, 
+				    description = "Encountered unexpected input",
+				    language = "en"},
+	    handle_disconnect(DisconnectMsg, State)   
+    end.		
+	    
 
 
 handle_request(ChannelPid, ChannelId, Type, Data, WantReply, From,
@@ -1442,17 +1495,27 @@ handle_ssh_packet(Length, StateName, #state{decoded_data_buffer = DecData0,
 	    handle_disconnect(DisconnectMsg, State0)
     end.
 
-handle_disconnect(#ssh_msg_disconnect{description = Desc} = Msg, #state{connection_state = Connection0,
-									role = Role} = State0) ->
+handle_disconnect(DisconnectMsg, State) ->
+    handle_disconnect(own, DisconnectMsg, State).
+
+handle_disconnect(#ssh_msg_disconnect{} = DisconnectMsg, State, Error) ->
+    handle_disconnect(own, DisconnectMsg, State, Error);
+handle_disconnect(Type,  #ssh_msg_disconnect{description = Desc} = Msg, #state{connection_state = Connection0,									role = Role} = State0) ->
     {disconnect, _, {{replies, Replies}, Connection}} = ssh_connection:handle_msg(Msg, Connection0, Role),
-    State = send_replies(Replies, State0),
+    State = send_replies(disconnect_replies(Type, Msg, Replies), State0),
     {stop, {shutdown, Desc}, State#state{connection_state = Connection}}.
-handle_disconnect(#ssh_msg_disconnect{description = Desc} = Msg, #state{connection_state = Connection0,
-									role = Role} = State0, ErrorMsg) ->
+
+handle_disconnect(Type, #ssh_msg_disconnect{description = Desc} = Msg, #state{connection_state = Connection0,
+									      role = Role} = State0, ErrorMsg) ->
     {disconnect, _, {{replies, Replies}, Connection}} = ssh_connection:handle_msg(Msg, Connection0, Role),
-    State = send_replies(Replies, State0),
+    State = send_replies(disconnect_replies(Type, Msg, Replies), State0),
     {stop, {shutdown, {Desc, ErrorMsg}}, State#state{connection_state = Connection}}.
 
+disconnect_replies(own, Msg, Replies) ->
+    [{connection_reply, Msg} | Replies];
+disconnect_replies(peer, _, Replies) ->
+    Replies.
+
 counterpart_versions(NumVsn, StrVsn, #ssh{role = server} = Ssh) ->
     Ssh#ssh{c_vsn = NumVsn , c_version = StrVsn};
 counterpart_versions(NumVsn, StrVsn, #ssh{role = client} = Ssh) ->
diff --git a/lib/ssh/src/ssh_info.erl b/lib/ssh/src/ssh_info.erl
new file mode 100644
index 0000000000..9ed598b3ab
--- /dev/null
+++ b/lib/ssh/src/ssh_info.erl
@@ -0,0 +1,193 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2014. 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
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%
+%%----------------------------------------------------------------------
+%% Purpose: Print some info of a running ssh aplication.
+%%----------------------------------------------------------------------
+
+-module(ssh_info).
+
+-compile(export_all).
+
+print() ->
+    try supervisor:which_children(ssh_sup)
+    of
+	_ ->
+	    io:nl(),
+	    print_general(),
+	    io:nl(),
+	    underline("Client part", $=),
+	    print_clients(),
+	    io:nl(),
+	    underline("Server part", $=),
+	    print_servers(),
+	    io:nl(),
+	    %% case os:type() of
+	    %% 	{unix,_} ->
+	    %% 	    io:nl(),
+	    %% 	    underline("Linux part", $=),
+	    %% 	    underline("Listening"),
+	    %% 	    catch io:format(os:cmd("netstat -tpln")),
+	    %% 	    io:nl(),
+	    %% 	    underline("Other"),
+	    %% 	    catch io:format(os:cmd("netstat -tpn"));
+	    %% 	_ -> ok
+	    %% end,
+	    underline("Supervisors", $=),
+	    walk_sups(ssh_sup),
+	    io:nl()
+    catch
+	_:_ ->
+	    io:format("Ssh not found~n",[])
+    end.
+
+%%%================================================================
+print_general() ->
+    {_Name, Slogan, Ver} = lists:keyfind(ssh,1,application:which_applications()),
+    underline(io_lib:format("~s  ~s", [Slogan, Ver]), $=),
+    io:format('This printout is generated ~s. ~n',[datetime()]).
+
+%%%================================================================
+print_clients() ->
+    try
+	lists:foreach(fun print_client/1, supervisor:which_children(sshc_sup))
+    catch
+	C:E ->
+	    io:format('***FAILED: ~p:~p~n',[C,E])
+    end.
+
+print_client({undefined,Pid,supervisor,[ssh_connection_handler]}) ->
+    {{Local,Remote},_Str} = ssh_connection_handler:get_print_info(Pid),
+    io:format("    Local=~s Remote=~s~n",[fmt_host_port(Local),fmt_host_port(Remote)]);
+print_client(Other) ->
+    io:format("    [[Other 1: ~p]]~n",[Other]).
+
+
+%%%================================================================
+print_servers() ->
+    try
+	lists:foreach(fun print_server/1, supervisor:which_children(sshd_sup))
+    catch
+	C:E ->
+	    io:format('***FAILED: ~p:~p~n',[C,E])
+    end.
+
+print_server({{server,ssh_system_sup,LocalHost,LocalPort},Pid,supervisor,[ssh_system_sup]}) when is_pid(Pid) ->
+    io:format('Local=~s (~p children)~n',[fmt_host_port({LocalHost,LocalPort}),
+					  ssh_acceptor:number_of_connections(Pid)]),
+    lists:foreach(fun print_system_sup/1, supervisor:which_children(Pid));
+print_server(Other) ->
+    io:format("    [[Other 2: ~p]]~n",[Other]).
+    
+print_system_sup({Ref,Pid,supervisor,[ssh_subsystem_sup]}) when is_reference(Ref),
+								is_pid(Pid) ->
+    lists:foreach(fun print_channels/1, supervisor:which_children(Pid));
+print_system_sup({{ssh_acceptor_sup,LocalHost,LocalPort}, Pid,supervisor, [ssh_acceptor_sup]}) when is_pid(Pid) ->
+    io:format("    [Acceptor for ~s]~n",[fmt_host_port({LocalHost,LocalPort})]);
+print_system_sup(Other) -> 
+    io:format("    [[Other 3: ~p]]~n",[Other]).
+
+print_channels({{server,ssh_channel_sup,_,_},Pid,supervisor,[ssh_channel_sup]}) when is_pid(Pid) ->
+    lists:foreach(fun print_channel/1, supervisor:which_children(Pid));
+print_channels(Other) -> 
+    io:format("    [[Other 4: ~p]]~n",[Other]).
+
+
+print_channel({Ref,Pid,worker,[ssh_channel]}) when is_reference(Ref), 
+						   is_pid(Pid)  ->
+    {{ConnManager,ChannelID}, Str} = ssh_channel:get_print_info(Pid),
+    {{Local,Remote},StrM} = ssh_connection_handler:get_print_info(ConnManager),
+    io:format('    ch ~p: ~s ~s',[ChannelID, StrM, Str]),
+    io:format("    Local=~s Remote=~s~n",[fmt_host_port(Local),fmt_host_port(Remote)]);
+print_channel(Other) -> 
+    io:format("    [[Other 5: ~p]]~n",[Other]).
+	      
+%%%================================================================
+-define(inc(N), (N+4)).
+
+walk_sups(StartPid) ->
+    io:format("Start at ~p, ~s.~n",[StartPid,dead_or_alive(StartPid)]),
+    walk_sups(children(StartPid), _Indent=?inc(0)).
+
+walk_sups([H={_,Pid,SupOrWorker,_}|T], Indent) ->
+    indent(Indent), io:format('~200p  ~p is ~s~n',[H,Pid,dead_or_alive(Pid)]),
+    case SupOrWorker of
+	supervisor -> walk_sups(children(Pid), ?inc(Indent));
+	_ -> ok
+    end,
+    walk_sups(T, Indent);
+walk_sups([], _) ->
+    ok.
+
+dead_or_alive(Name) when is_atom(Name) ->
+    case whereis(Name) of
+	undefined -> 
+	    "**UNDEFINED**";
+	Pid -> 
+	    dead_or_alive(Pid)
+    end;
+dead_or_alive(Pid) when is_pid(Pid) ->
+    case process_info(Pid) of
+	undefined -> "**DEAD**";
+	_ -> "alive"
+    end.
+
+indent(I) -> io:format('~*c',[I,$ ]). 
+
+children(Pid) ->
+    Parent = self(),
+    Helper = spawn(fun() ->
+			   Parent ! {self(),supervisor:which_children(Pid)}
+		   end),
+    receive
+	{Helper,L} when is_list(L) ->
+	    L
+    after
+	2000 -> 
+	    catch exit(Helper, kill),
+	    []
+    end.
+
+%%%================================================================
+underline(Str) ->
+    underline(Str, $-).
+
+underline(Str, LineChar) ->
+    Len = lists:flatlength(Str),
+    io:format('~s~n',[Str]),
+    line(Len,LineChar).
+
+line(Len, Char) ->
+    io:format('~*c~n', [Len,Char]).
+	    
+
+datetime() ->
+    {{YYYY,MM,DD}, {H,M,S}} = calendar:now_to_universal_time(now()),
+    lists:flatten(io_lib:format('~4w-~2..0w-~2..0w ~2..0w:~2..0w:~2..0w UTC',[YYYY,MM,DD, H,M,S])).
+
+
+fmt_host_port({{A,B,C,D},Port}) -> io_lib:format('~p.~p.~p.~p:~p',[A,B,C,D,Port]);
+fmt_host_port({Host,Port}) -> io_lib:format('~s:~p',[Host,Port]).
+
+
+
+nyi() ->
+    io:format('Not yet implemented~n',[]),
+    nyi.
diff --git a/lib/ssh/src/ssh_message.erl b/lib/ssh/src/ssh_message.erl
index 891ccec24c..66e7717095 100644
--- a/lib/ssh/src/ssh_message.erl
+++ b/lib/ssh/src/ssh_message.erl
@@ -505,6 +505,11 @@ erl_boolean(1) ->
 
 decode_kex_init(<<?BYTE(Bool), ?UINT32(X)>>, Acc, 0) ->
     list_to_tuple(lists:reverse([X, erl_boolean(Bool) | Acc]));
+decode_kex_init(<<?BYTE(Bool)>>, Acc, 0) ->
+    %% The mandatory trailing UINT32 is missing. Assume the value it anyhow must have
+    %% See rfc 4253 7.1
+    X = 0,
+    list_to_tuple(lists:reverse([X, erl_boolean(Bool) | Acc]));
 decode_kex_init(<<?UINT32(Len), Data:Len/binary, Rest/binary>>, Acc, N) ->
     Names = string:tokens(unicode:characters_to_list(Data), ","),
     decode_kex_init(Rest, [Names | Acc], N -1).