Merge branch 'maint'

12 files changed, 365 insertions, 110 deletions

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 0b587db810..467e2ab27e 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,6 +29,56 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 3.0.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Gracefully handle bad data from the client when expecting
+	    ssh version exchange.</p>
+          <p>
+	    Own Id: OTP-12157 Aux Id: seq12706 </p>
+        </item>
+        <item>
+          <p>
+	    When restarting an ssh daemon, that was stopped with
+	    ssh:stop_listner/ [1,2] new options given shall replace
+	    old ones.</p>
+          <p>
+	    Own Id: OTP-12168 Aux Id: seq12711 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    ssh now has a format_status function to avoid printing
+	    sensitive information in error loggs.</p>
+          <p>
+	    Own Id: OTP-12030</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Known Bugs and Problems</title>
+      <list>
+        <item>
+          <p>
+	    The option <c>parallel_login</c> didn't work with the
+	    value <c>true</c>. All logins were serial.</p>
+          <p>
+	    Own Id: OTP-12194</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 3.0.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 8269f89e40..1917c95f5a 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,25 +19,9 @@
 
 {"%VSN%",	
  [
-  {"3.0.2", [{load_module, ssh_message, soft_purge, soft_purge, []},
-	     {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
-	     {load_module, ssh_io, soft_purge, soft_purge, []}]},
-  {"3.0.1", [{load_module, ssh, soft_purge, soft_purge, []},
-	     {load_module, ssh_acceptor, soft_purge, soft_purge, []},
-	     {load_module, ssh_message, soft_purge, soft_purge, []},
-	     {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
-	     {load_module, ssh_io, soft_purge, soft_purge, []}]},
   {<<".*">>, [{restart_application, ssh}]}
  ],
  [
-  {"3.0.2", [{load_module, ssh_message, soft_purge, soft_purge, []},
-	     {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
-	     {load_module, ssh_io, soft_purge, soft_purge, []}]},
-  {"3.0.1", [{load_module, ssh, soft_purge, soft_purge, []},
-	     {load_module, ssh_acceptor, soft_purge, soft_purge, []},
-	     {load_module, ssh_message, soft_purge, soft_purge, []},
-	     {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
-	     {load_module, ssh_io, soft_purge, soft_purge, []}]},
   {<<".*">>, [{restart_application, ssh}]}
  ]
 }.
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 8a8d4bb89e..de047d3c83 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -234,22 +234,26 @@ do_start_daemon(Host, Port, Options, SocketOptions) ->
 				      {port, Port}, {role, server},
 				      {socket_opts, SocketOptions}, 
 				      {ssh_opts, Options}]) of
-		{ok, SysSup} ->
-		    {ok, SysSup};
 		{error, {already_started, _}} ->
 		    {error, eaddrinuse};
-		{error, R} ->
-		    {error, R}
+		Result = {Code, _} when (Code == ok) or (Code == error) ->
+		    Result
 	    catch
 		exit:{noproc, _} ->
 		    {error, ssh_not_started}
 	    end;
 	Sup  ->
-	    case ssh_system_sup:restart_acceptor(Host, Port) of
+	    AccPid = ssh_system_sup:acceptor_supervisor(Sup),
+	    case ssh_acceptor_sup:start_child(AccPid, [{address, Host},
+						       {port, Port}, {role, server},
+						       {socket_opts, SocketOptions},
+						       {ssh_opts, Options}]) of
+		{error, {already_started, _}} ->
+		    {error, eaddrinuse};
 		{ok, _} ->
 		    {ok, Sup};
-		_  ->
-		    {error, eaddrinuse}
+		Other ->
+		    Other
 	    end
     end.
 
diff --git a/lib/ssh/src/ssh_acceptor_sup.erl b/lib/ssh/src/ssh_acceptor_sup.erl
index 2be729d305..46fdef07d0 100644
--- a/lib/ssh/src/ssh_acceptor_sup.erl
+++ b/lib/ssh/src/ssh_acceptor_sup.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
@@ -26,7 +26,7 @@
 -module(ssh_acceptor_sup).
 -behaviour(supervisor).
 
--export([start_link/1, start_child/2, stop_child/2]).
+-export([start_link/1, start_child/2, stop_child/3]).
 
 %% Supervisor callback
 -export([init/1]).
@@ -45,18 +45,17 @@ start_child(AccSup, ServerOpts) ->
 	{error, already_present} ->
 	    Address = proplists:get_value(address, ServerOpts),
 	    Port = proplists:get_value(port, ServerOpts),
-	    Name = id(Address, Port),
-	    supervisor:delete_child(?MODULE, Name),
+	    stop_child(AccSup, Address, Port),
 	    supervisor:start_child(AccSup, Spec);
 	Reply ->
 	    Reply
     end.
 
-stop_child(Address, Port) ->
+stop_child(AccSup, Address, Port) ->
     Name = id(Address, Port),
-    case supervisor:terminate_child(?MODULE, Name) of
+    case supervisor:terminate_child(AccSup, Name) of
         ok ->
-            supervisor:delete_child(?MODULE, Name);
+            supervisor:delete_child(AccSup, Name);
         Error ->
             Error
     end.
diff --git a/lib/ssh/src/ssh_connect.hrl b/lib/ssh/src/ssh_connect.hrl
index 8421b07167..9307dbbad0 100644
--- a/lib/ssh/src/ssh_connect.hrl
+++ b/lib/ssh/src/ssh_connect.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2005-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
@@ -26,6 +26,7 @@
 -define(DEFAULT_PACKET_SIZE, 32768).
 -define(DEFAULT_WINDOW_SIZE, 2*?DEFAULT_PACKET_SIZE).
 -define(DEFAULT_TIMEOUT, 5000).
+-define(MAX_PROTO_VERSION, 255).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 86804c4436..4fbc5d0ae2 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-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
@@ -48,7 +48,7 @@
 	 userauth/2, connected/2]).
 
 -export([init/1, handle_event/3,
-	 handle_sync_event/4, handle_info/3, terminate/3, code_change/4]).
+	 handle_sync_event/4, handle_info/3, terminate/3, format_status/2, code_change/4]).
 
 -record(state, {
 	  role,
@@ -71,7 +71,8 @@
 	  connection_queue,
 	  address,
 	  port,
-	  opts
+	  opts,
+	  recbuf
 	 }). 
 
 -type state_name()           :: hello | kexinit | key_exchange | new_keys | userauth | connection.
@@ -103,12 +104,22 @@ start_connection(client = Role, Socket, Options, Timeout) ->
     end;
 
 start_connection(server = Role, Socket, Options, Timeout) ->
+    SSH_Opts = proplists:get_value(ssh_opts, Options, []),
     try
-	case proplists:get_value(parallel_login, Options, false) of
+	case proplists:get_value(parallel_login, SSH_Opts, false) of
 	    true ->
-		spawn(fun() -> start_server_connection(Role, Socket, Options, Timeout) end);
+		HandshakerPid = 
+		    spawn_link(fun() -> 
+				       receive
+					   {do_handshake, Pid} ->
+					       handshake(Pid, erlang:monitor(process,Pid), Timeout)
+				       end
+			       end),
+		ChildPid = start_the_connection_child(HandshakerPid, Role, Socket, Options),
+		HandshakerPid ! {do_handshake, ChildPid};
 	    false ->
-		start_server_connection(Role, Socket, Options, Timeout)
+		ChildPid = start_the_connection_child(self(), Role, Socket, Options),
+		handshake(ChildPid, erlang:monitor(process,ChildPid), Timeout)
 	end
     catch
 	exit:{noproc, _} ->
@@ -117,16 +128,14 @@ start_connection(server = Role, Socket, Options, Timeout) ->
 	    {error, Error}
     end.
 
-
-start_server_connection(server = Role, Socket, Options, Timeout) ->
+start_the_connection_child(UserPid, Role, Socket, Options) ->
     Sups = proplists:get_value(supervisors, Options),
     ConnectionSup = proplists:get_value(connection_sup, Sups),
-    Opts = [{supervisors, Sups}, {user_pid, self()} | proplists:get_value(ssh_opts, Options, [])],
+    Opts = [{supervisors, Sups}, {user_pid, UserPid} | proplists:get_value(ssh_opts, Options, [])],
     {ok, Pid} = ssh_connection_sup:start_child(ConnectionSup, [Role, Socket, Opts]),
     {_, Callback, _} =  proplists:get_value(transport, Options, {tcp, gen_tcp, tcp_closed}),
     socket_control(Socket, Pid, Callback),
-    Ref = erlang:monitor(process, Pid),
-    handshake(Pid, Ref, Timeout).
+    Pid.
 
 
 start_link(Role, Socket, Options) ->
@@ -293,28 +302,39 @@ info(ConnectionHandler, ChannelProcess) ->
 hello(socket_control, #state{socket = Socket, ssh_params = Ssh} = State) ->
     VsnMsg = ssh_transport:hello_version_msg(string_version(Ssh)),
     send_msg(VsnMsg, State),
-    inet:setopts(Socket, [{packet, line}, {active, once}]),
-    {next_state, hello, State};
+    {ok, [{recbuf, Size}]} = inet:getopts(Socket, [recbuf]),
+    inet:setopts(Socket, [{packet, line}, {active, once}, {recbuf, ?MAX_PROTO_VERSION}]),
+    {next_state, hello, State#state{recbuf = Size}};
 
-hello({info_line, _Line},#state{socket = Socket} = State) ->
+hello({info_line, _Line},#state{role = client, socket = Socket} = State) ->
+    %% The server may send info lines before the version_exchange
     inet:setopts(Socket, [{active, once}]),
     {next_state, hello, State};
 
+hello({info_line, _Line},#state{role = server} = State) ->
+    DisconnectMsg =
+	#ssh_msg_disconnect{code =
+				?SSH_DISCONNECT_PROTOCOL_ERROR,
+			    description = "Did not receive expected protocol version exchange",
+			    language = "en"},
+    handle_disconnect(DisconnectMsg, State);
+
 hello({version_exchange, Version}, #state{ssh_params = Ssh0,
-					  socket = Socket} = State) ->
+					  socket = Socket,
+					  recbuf = Size} = State) ->
     {NumVsn, StrVsn} = ssh_transport:handle_hello_version(Version),
     case handle_version(NumVsn, StrVsn, Ssh0) of
 	{ok, Ssh1} ->
-	    inet:setopts(Socket, [{packet,0}, {mode,binary}, {active, once}]),
+	    inet:setopts(Socket, [{packet,0}, {mode,binary}, {active, once}, {recbuf, Size}]),
 	    {KeyInitMsg, SshPacket, Ssh} = ssh_transport:key_exchange_init_msg(Ssh1),
 	    send_msg(SshPacket, State),
 	    {next_state, kexinit, next_packet(State#state{ssh_params = Ssh,
 							  key_exchange_init_msg = 
 							  KeyInitMsg})};
 	not_supported ->
-	   DisconnectMsg =
+	    DisconnectMsg =
 		#ssh_msg_disconnect{code = 
-				    ?SSH_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED,
+					?SSH_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED,
 				    description = "Protocol version " ++  StrVsn 
 				    ++ " not supported",
 				    language = "en"},
@@ -951,6 +971,36 @@ terminate_subsytem(#connection{system_supervisor = SysSup,
 terminate_subsytem(_) ->
     ok.
 
+format_status(normal, [_, State]) ->
+    [{data, [{"StateData", State}]}]; 
+format_status(terminate, [_, State]) ->
+    SshParams0 = (State#state.ssh_params),
+    SshParams = SshParams0#ssh{c_keyinit = "***",
+			       s_keyinit = "***",
+			       send_mac_key = "***",
+			       send_mac_size =  "***",
+			       recv_mac_key = "***",
+			       recv_mac_size = "***",
+			       encrypt_keys = "***",
+			       encrypt_ctx = "***",
+			       decrypt_keys = "***",
+			       decrypt_ctx = "***",
+			       compress_ctx = "***",
+			       decompress_ctx = "***",
+			       shared_secret =  "***",
+			       exchanged_hash =  "***",
+			       session_id =  "***", 
+			       keyex_key =  "***", 
+			       keyex_info = "***", 
+			       available_host_keys = "***"},
+    [{data, [{"StateData", State#state{decoded_data_buffer = "***",
+				       encoded_data_buffer =  "***",
+				       key_exchange_init_msg = "***",
+				       opts =  "***",
+				       recbuf =  "***",
+				       ssh_params = SshParams
+				      }}]}].
+
 %%--------------------------------------------------------------------
 -spec code_change(OldVsn::term(), state_name(), Oldstate::term(), Extra::term()) ->
 			 {ok, state_name(), #state{}}.
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index 848133f838..660fe8bb65 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.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
@@ -173,8 +173,8 @@ ssh_acceptor_sup([_ | Rest]) ->
     ssh_acceptor_sup(Rest).
 
 stop_acceptor(Sup) ->
-    [Name] =
-	[SupName || {SupName, _, _, [ssh_acceptor_sup]} <- 
+    [{Name, AcceptorSup}] =
+	[{SupName, ASup} || {SupName, ASup, _, [ssh_acceptor_sup]} <- 
 			  supervisor:which_children(Sup)],
-    supervisor:terminate_child(Sup, Name).
+    supervisor:terminate_child(AcceptorSup, Name).
 
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index ea05c849b7..76fa776113 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2004-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
@@ -82,16 +82,21 @@ format_version({Major,Minor}) ->
 	integer_to_list(Minor) ++ "-Erlang".
 
 handle_hello_version(Version) ->
-    StrVersion = trim_tail(Version),
-    case string:tokens(Version, "-") of
-	[_, "2.0" | _] ->
-	    {{2,0}, StrVersion}; 
-	[_, "1.99" | _] ->
-	    {{2,0}, StrVersion}; 
-	[_, "1.3" | _] ->
-	    {{1,3}, StrVersion}; 
-	[_, "1.5" | _] ->
-	    {{1,5}, StrVersion}
+    try
+	StrVersion = trim_tail(Version),
+	case string:tokens(Version, "-") of
+	    [_, "2.0" | _] ->
+		{{2,0}, StrVersion};
+	    [_, "1.99" | _] ->
+		{{2,0}, StrVersion};
+	    [_, "1.3" | _] ->
+		{{1,3}, StrVersion};
+	    [_, "1.5" | _] ->
+		{{1,5}, StrVersion}
+	end
+    catch
+	error:_ ->
+	    {undefined, "unknown version"}
     end.
 
 key_exchange_init_msg(Ssh0) ->
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 9242731924..415cb9fc9c 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -798,12 +798,14 @@ ssh_connect_nonegtimeout_connected(Config, Parallel) ->
 					       {parallel_login, Parallel},
 					       {negotiation_timeout, NegTimeOut},
 					       {failfun, fun ssh_test_lib:failfun/2}]),
+    ct:pal("~p Listen ~p:~p",[_Pid,_Host,Port]),
     ct:sleep(500),
 
     IO = ssh_test_lib:start_io_server(),
     Shell = ssh_test_lib:start_shell(Port, IO, UserDir),
     receive
-	{'EXIT', _, _} ->
+	Error = {'EXIT', _, _} ->
+	    ct:pal("~p",[Error]),
 	    ct:fail(no_ssh_connection);  
 	ErlShellStart ->
 	    ct:pal("---Erlang shell start: ~p~n", [ErlShellStart]),
@@ -898,7 +900,12 @@ connect_fun(ssh_sftp__start_channel, _Config) ->
     end.
 
 
-max_sessions(Config, ParallelLogin, Connect) when is_function(Connect,2) ->
+max_sessions(Config, ParallelLogin, Connect0) when is_function(Connect0,2) ->
+    Connect = fun(Host,Port) ->
+		      R = Connect0(Host,Port),
+		      ct:pal("Connect(~p,~p) -> ~p",[Host,Port,R]),
+		      R
+	      end,
     SystemDir = filename:join(?config(priv_dir, Config), system),
     UserDir = ?config(priv_dir, Config),
     MaxSessions = 5,
@@ -909,7 +916,7 @@ max_sessions(Config, ParallelLogin, Connect) when is_function(Connect,2) ->
 					     {parallel_login, ParallelLogin},
 					     {max_sessions, MaxSessions}
 					    ]),
-
+    ct:pal("~p Listen ~p:~p for max ~p sessions",[Pid,Host,Port,MaxSessions]),
     try [Connect(Host,Port) || _ <- lists:seq(1,MaxSessions)]
     of
 	Connections ->
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index c52b91986b..d226e5ba03 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -31,8 +31,8 @@
 %% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
 
-suite() ->
-    [{ct_hooks,[ts_install_cth]}].
+%% suite() ->
+%%     [{ct_hooks,[ts_install_cth]}].
 
 all() ->
     [
@@ -40,7 +40,12 @@ all() ->
      interrupted_send,
      start_shell,
      start_shell_exec,
-     start_shell_exec_fun
+     start_shell_exec_fun,
+     gracefull_invalid_version,
+     gracefull_invalid_start,
+     gracefull_invalid_long_start,
+     gracefull_invalid_long_start_no_nl,
+     stop_listener
     ].
 groups() ->
     [{openssh_payload, [], [simple_exec,
@@ -67,7 +72,7 @@ init_per_group(openssh_payload, _Config) ->
 	    {skip,"No openssh deamon"};
 	{ok, Socket} ->
 	    gen_tcp:close(Socket)
-     end;
+    end;
 init_per_group(_, Config) ->
     Config.
 
@@ -180,10 +185,10 @@ big_cat(Config) when is_list(Config) ->
 	    case size(Data) =:= size(Other) of
 		true ->
 		    ct:pal("received and sent data are same"
-				       "size but do not match~n",[]);
+			   "size but do not match~n",[]);
 		false ->
 		    ct:pal("sent ~p but only received ~p~n",
-				       [size(Data), size(Other)])
+			   [size(Data), size(Other)])
 	    end,
 	    ct:fail(receive_data_mismatch);
 	Else ->
@@ -250,10 +255,10 @@ interrupted_send(Config) when is_list(Config) ->
 					     {subsystems, [{"echo_n", {ssh_echo_server, [4000000]}}]}]),
 
     ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
-					  {user, "foo"},
-					  {password, "morot"},
-					  {user_interaction, false},
-					  {user_dir, UserDir}]),
+						      {user, "foo"},
+						      {password, "morot"},
+						      {user_interaction, false},
+						      {user_dir, UserDir}]),
 
     {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
 
@@ -288,24 +293,24 @@ start_shell(Config) when is_list(Config) ->
     file:make_dir(UserDir),
     SysDir = ?config(data_dir, Config),
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
-                         {user_dir, UserDir},
-                         {password, "morot"},
-                         {shell, fun(U, H) -> start_our_shell(U, H) end} ]),
+					     {user_dir, UserDir},
+					     {password, "morot"},
+					     {shell, fun(U, H) -> start_our_shell(U, H) end} ]),
 
     ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
-                      {user, "foo"},
-                      {password, "morot"},
-                      {user_interaction, true},
-                      {user_dir, UserDir}]),
+						      {user, "foo"},
+						      {password, "morot"},
+						      {user_interaction, true},
+						      {user_dir, UserDir}]),
 
     {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
     ok = ssh_connection:shell(ConnectionRef,ChannelId0),
 
     receive
-    {ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"Enter command\r\n">>}} ->
-        ok
+	{ssh_cm,ConnectionRef, {data, ChannelId0, 0, <<"Enter command\r\n">>}} ->
+	    ok
     after 5000 ->
-        ct:fail("CLI Timeout")
+	    ct:fail("CLI Timeout")
     end,
 
     ssh:close(ConnectionRef),
@@ -320,25 +325,25 @@ start_shell_exec(Config) when is_list(Config) ->
     file:make_dir(UserDir),
     SysDir = ?config(data_dir, Config),
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
-                         {user_dir, UserDir},
-                         {password, "morot"},
-                         {exec, {?MODULE,ssh_exec,[]}} ]),
+					     {user_dir, UserDir},
+					     {password, "morot"},
+					     {exec, {?MODULE,ssh_exec,[]}} ]),
 
     ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
-                      {user, "foo"},
-                      {password, "morot"},
-                      {user_interaction, true},
-                      {user_dir, UserDir}]),
+						      {user, "foo"},
+						      {password, "morot"},
+						      {user_interaction, true},
+						      {user_dir, UserDir}]),
 
     {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
 
     success = ssh_connection:exec(ConnectionRef, ChannelId0,
-                  "testing", infinity),
+				  "testing", infinity),
     receive
 	{ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"testing\r\n">>}} ->
 	    ok
     after 5000 ->
-        ct:fail("Exec Timeout")
+	    ct:fail("Exec Timeout")
     end,
 
     ssh:close(ConnectionRef),
@@ -354,30 +359,177 @@ start_shell_exec_fun(Config) when is_list(Config) ->
     file:make_dir(UserDir),
     SysDir = ?config(data_dir, Config),
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
-                         {user_dir, UserDir},
-                         {password, "morot"},
-                         {exec, fun ssh_exec/1}]),
+					     {user_dir, UserDir},
+					     {password, "morot"},
+					     {exec, fun ssh_exec/1}]),
 
     ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
-                      {user, "foo"},
-                      {password, "morot"},
-                      {user_interaction, true},
-                      {user_dir, UserDir}]),
+						      {user, "foo"},
+						      {password, "morot"},
+						      {user_interaction, true},
+						      {user_dir, UserDir}]),
 
     {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
 
     success = ssh_connection:exec(ConnectionRef, ChannelId0,
-                  "testing", infinity),
+				  "testing", infinity),
 
     receive
 	{ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"testing\r\n">>}} ->
 	    ok
     after 5000 ->
-        ct:fail("Exec Timeout")
+	    ct:fail("Exec Timeout")
     end,
 
     ssh:close(ConnectionRef),
     ssh:stop_daemon(Pid).
+
+%%--------------------------------------------------------------------
+
+gracefull_invalid_version(Config) when is_list(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
+    file:make_dir(UserDir),
+    SysDir = ?config(data_dir, Config),
+    
+    {_Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
+					     {user_dir, UserDir},
+					     {password, "morot"}]),
+
+    {ok, S} = gen_tcp:connect(Host, Port, []),
+    ok = gen_tcp:send(S,  ["SSH-8.-1","\r\n"]),
+    receive
+	Verstring ->
+	    ct:pal("Server version: ~p~n", [Verstring]),
+	    receive
+		{tcp_closed, S} ->
+		    ok
+	    end
+    end.
+
+gracefull_invalid_start(Config) when is_list(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
+    file:make_dir(UserDir),
+    SysDir = ?config(data_dir, Config),
+    {_Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
+					     {user_dir, UserDir},
+					     {password, "morot"}]),
+
+    {ok, S} = gen_tcp:connect(Host, Port, []),
+    ok = gen_tcp:send(S,  ["foobar","\r\n"]),
+    receive
+	Verstring ->
+	    ct:pal("Server version: ~p~n", [Verstring]),
+	    receive
+		{tcp_closed, S} ->
+		    ok
+	    end
+    end.
+
+gracefull_invalid_long_start(Config) when is_list(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
+    file:make_dir(UserDir),
+    SysDir = ?config(data_dir, Config),
+    {_Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
+					     {user_dir, UserDir},
+					     {password, "morot"}]),
+
+    {ok, S} = gen_tcp:connect(Host, Port, []),
+    ok = gen_tcp:send(S, [lists:duplicate(257, $a), "\r\n"]),
+    receive
+	Verstring ->
+	    ct:pal("Server version: ~p~n", [Verstring]),
+	    receive
+		{tcp_closed, S} ->
+		    ok
+	    end
+    end.
+
+
+gracefull_invalid_long_start_no_nl(Config) when is_list(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
+    file:make_dir(UserDir),
+    SysDir = ?config(data_dir, Config),
+    {_Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
+					     {user_dir, UserDir},
+					     {password, "morot"}]),
+
+    {ok, S} = gen_tcp:connect(Host, Port, []),
+    ok = gen_tcp:send(S, [lists:duplicate(257, $a), "\r\n"]),
+    receive
+	Verstring ->
+	    ct:pal("Server version: ~p~n", [Verstring]),
+	    receive
+		{tcp_closed, S} ->
+		    ok
+	    end
+    end.
+
+stop_listener() ->
+    [{doc, "start ssh daemon, setup connections, stop listener, restart listner"}].
+
+stop_listener(Config) when is_list(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
+    file:make_dir(UserDir),
+    SysDir = ?config(data_dir, Config),
+
+    {Pid0, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
+					      {user_dir, UserDir},
+					      {password, "morot"},
+					      {exec, fun ssh_exec/1}]),
+
+    ConnectionRef0 = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+						       {user, "foo"},
+						       {password, "morot"},
+						       {user_interaction, true},
+						       {user_dir, UserDir}]),
+
+    {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef0, infinity),
+
+    ssh:stop_listener(Host, Port),
+
+    {error, _} = ssh:connect(Host, Port, [{silently_accept_hosts, true},
+					  {user, "foo"},
+					  {password, "morot"},
+					  {user_interaction, true},
+					  {user_dir, UserDir}]),
+    success = ssh_connection:exec(ConnectionRef0, ChannelId0,
+				  "testing", infinity),
+    receive
+	{ssh_cm, ConnectionRef0, {data, ChannelId0, 0, <<"testing\r\n">>}} ->
+	    ok
+    after 5000 ->
+	    ct:fail("Exec Timeout")
+    end,
+
+    {ok, HostAddr} = inet:getaddr(Host, inet),
+    case ssh_test_lib:daemon(HostAddr, Port, [{system_dir, SysDir},
+							     {user_dir, UserDir},
+							     {password, "potatis"},
+							     {exec, fun ssh_exec/1}]) of
+	{Pid1, HostAddr, Port} ->
+	    ConnectionRef1 = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+							       {user, "foo"},
+							       {password, "potatis"},
+							       {user_interaction, true},
+							       {user_dir, UserDir}]),
+	    {error, _} = ssh:connect(Host, Port, [{silently_accept_hosts, true},
+						       {user, "foo"},
+						       {password, "morot"},
+						       {user_interaction, true},
+						       {user_dir, UserDir}]),
+	    ssh:close(ConnectionRef0),
+	    ssh:close(ConnectionRef1),
+	    ssh:stop_daemon(Pid0),
+	    ssh:stop_daemon(Pid1);
+	Error ->
+	    ct:fail({unexpected, Error})
+    end.
+
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
@@ -413,14 +565,14 @@ collect_data(ConnectionRef, ChannelId, Acc) ->
     end.
 
 %%%-------------------------------------------------------------------
-% This is taken from the ssh example code.  
+%% This is taken from the ssh example code.
 start_our_shell(_User, _Peer) ->
     spawn(fun() ->
-            io:format("Enter command\n")
-            %% Don't actually loop, just exit
+		  io:format("Enter command\n")
+		  %% Don't actually loop, just exit
           end).
 
 ssh_exec(Cmd) ->
     spawn(fun() ->
-            io:format(Cmd ++ "\n")
+		  io:format(Cmd ++ "\n")
           end).
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 00c25bf394..b8abf5e80e 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -113,6 +113,9 @@ io_request({put_chars, Chars}, TestCase, _, _, Buff) ->
 io_request({put_chars, unicode, Chars}, TestCase, _, _, Buff) when is_binary(Chars) ->
     reply(TestCase, Chars),
     {ok, ok, Buff};
+io_request({put_chars, unicode, io_lib, format, [Fmt,Args]}, TestCase, _, _, Buff) ->
+    reply(TestCase, io_lib:format(Fmt,Args)),
+    {ok, ok, Buff};
 io_request({put_chars, Enc, Chars}, TestCase, _, _, Buff) ->
     reply(TestCase, unicode:characters_to_binary(Chars,Enc,latin1)),
     {ok, ok, Buff};
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 73bf73971f..11f30e8d04 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 3.0.5
+SSH_VSN = 3.0.6
 APP_VSN    = "ssh-$(SSH_VSN)"