Merge branch 'hans/ssh/cuddle_tests' into maint

* hans/ssh/cuddle_tests:
  ssh: ct:pal -> ct:log in lib/ssh/test
  ssh: ssh_trpt_test_lib improvments
  ssh: Unicode test improvments

12 files changed, 266 insertions, 165 deletions

diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 39ea2c9609..f30e86f193 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -245,8 +245,8 @@ init_per_testcase(TC, Config) when TC==shell_no_unicode ;
     Shell = ssh_test_lib:start_shell(Port, IO, UserDir,
 				     [{silently_accept_hosts, true},
 				      {user,"foo"},{password,"bar"}]),
-    ct:pal("IO=~p, Shell=~p, self()=~p",[IO,Shell,self()]),
-    ct:pal("file:native_name_encoding() = ~p,~nio:getopts() = ~p",
+    ct:log("IO=~p, Shell=~p, self()=~p",[IO,Shell,self()]),
+    ct:log("file:native_name_encoding() = ~p,~nio:getopts() = ~p",
 	   [file:native_name_encoding(),io:getopts()]),
     wait_for_erlang_first_line([{io,IO}, {shell,Shell}, {sftpd, Sftpd}  | Config]);
 init_per_testcase(_TestCase, Config) ->
@@ -620,7 +620,7 @@ shell(Config) when is_list(Config) ->
 	{'EXIT', _, _} ->
 	    ct:fail(no_ssh_connection);  
 	ErlShellStart ->
-	    ct:pal("Erlang shell start: ~p~n", [ErlShellStart]),
+	    ct:log("Erlang shell start: ~p~n", [ErlShellStart]),
 	    do_shell(IO, Shell)
     end.
     
@@ -704,7 +704,7 @@ server_password_option(Config) when is_list(Config) ->
 				 {user_interaction, false},
 				 {user_dir, UserDir}]),
     
-    ct:pal("Test of wrong password: Error msg: ~p ~n", [Reason]),
+    ct:log("Test of wrong password: Error msg: ~p ~n", [Reason]),
 
     ssh:close(ConnectionRef),
     ssh:stop_daemon(Pid).
@@ -1259,13 +1259,13 @@ peername_sockname(Config) when is_list(Config) ->
 	ssh:connection_info(ConnectionRef, [peer]),
     [{sockname, {HostSockClient,PortSockClient} = ClientSock}] =
 	ssh:connection_info(ConnectionRef, [sockname]),
-    ct:pal("Client: ~p ~p", [ClientPeer, ClientSock]),
+    ct:log("Client: ~p ~p", [ClientPeer, ClientSock]),
     receive
 	{ssh_cm, ConnectionRef, {data, ChannelId, _, Response}} ->
 	    {PeerNameSrv,SockNameSrv} = binary_to_term(Response),
 	    {HostPeerSrv,PortPeerSrv} = PeerNameSrv,
 	    {HostSockSrv,PortSockSrv} = SockNameSrv,
-	    ct:pal("Server: ~p ~p", [PeerNameSrv, SockNameSrv]),
+	    ct:log("Server: ~p ~p", [PeerNameSrv, SockNameSrv]),
 	    host_equal(HostPeerSrv, HostSockClient),
 	    PortPeerSrv = PortSockClient,
 	    host_equal(HostSockSrv, HostPeerClient),
@@ -1443,7 +1443,7 @@ packet_size_zero(Config) ->
 
     receive
 	{ssh_cm,Conn,{data,Chan,_Type,_Msg1}} = M ->
-	    ct:pal("Got ~p",[M]),
+	    ct:log("Got ~p",[M]),
 	    ct:fail(doesnt_obey_max_packet_size_0)
     after 5000 ->
 	    ok
@@ -1520,7 +1520,7 @@ chan_exec(ConnectionRef, Cmnd, Expected) ->
 	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId0);
 	{unexpected_msg,{ssh_cm, ConnectionRef, {exit_status, ChannelId0, 0}}
 	 = ExitStatus0} ->
-	    ct:pal("0: Collected data ~p", [ExitStatus0]),
+	    ct:log("0: Collected data ~p", [ExitStatus0]),
 	    ssh_test_lib:receive_exec_result(Data0,
 					     ConnectionRef, ChannelId0);
 	Other0 ->
@@ -1612,7 +1612,7 @@ ssh_connect_negtimeout(Config, Parallel) ->
     {ok,Socket} = gen_tcp:connect(Host, Port, []),
 
     Factor = 2,
-    ct:pal("And now sleeping ~p*NegTimeOut (~p ms)...", [Factor, round(Factor * NegTimeOut)]),
+    ct:log("And now sleeping ~p*NegTimeOut (~p ms)...", [Factor, round(Factor * NegTimeOut)]),
     ct:sleep(round(Factor * NegTimeOut)),
     
     case inet:sockname(Socket) of
@@ -1643,22 +1643,22 @@ 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:log("~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
 	Error = {'EXIT', _, _} ->
-	    ct:pal("~p",[Error]),
+	    ct:log("~p",[Error]),
 	    ct:fail(no_ssh_connection);  
 	ErlShellStart ->
-	    ct:pal("---Erlang shell start: ~p~n", [ErlShellStart]),
+	    ct:log("---Erlang shell start: ~p~n", [ErlShellStart]),
 	    one_shell_op(IO, NegTimeOut),
 	    one_shell_op(IO, NegTimeOut),
 
 	    Factor = 2,
-	    ct:pal("And now sleeping ~p*NegTimeOut (~p ms)...", [Factor, round(Factor * NegTimeOut)]),
+	    ct:log("And now sleeping ~p*NegTimeOut (~p ms)...", [Factor, round(Factor * NegTimeOut)]),
 	    ct:sleep(round(Factor * NegTimeOut)),
     
 	    one_shell_op(IO, NegTimeOut)
@@ -1667,7 +1667,7 @@ ssh_connect_nonegtimeout_connected(Config, Parallel) ->
 
 
 one_shell_op(IO, TimeOut) ->
-    ct:pal("One shell op: Waiting for prompter"),
+    ct:log("One shell op: Waiting for prompter"),
     receive
 	ErlPrompt0 -> ct:log("Erlang prompt: ~p~n", [ErlPrompt0])
 	after TimeOut -> ct:fail("Timeout waiting for promter")
@@ -1770,7 +1770,7 @@ connect_fun(ssh_sftp__start_channel, _Config) ->
 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]),
+		      ct:log("Connect(~p,~p) -> ~p",[Host,Port,R]),
 		      R
 	      end,
     SystemDir = filename:join(?config(priv_dir, Config), system),
@@ -1783,7 +1783,7 @@ max_sessions(Config, ParallelLogin, Connect0) when is_function(Connect0,2) ->
 					     {parallel_login, ParallelLogin},
 					     {max_sessions, MaxSessions}
 					    ]),
-    ct:pal("~p Listen ~p:~p for max ~p sessions",[Pid,Host,Port,MaxSessions]),
+    ct:log("~p Listen ~p:~p for max ~p sessions",[Pid,Host,Port,MaxSessions]),
     try [Connect(Host,Port) || _ <- lists:seq(1,MaxSessions)]
     of
 	Connections ->
@@ -1792,7 +1792,7 @@ max_sessions(Config, ParallelLogin, Connect0) when is_function(Connect0,2) ->
 	    [_|_] = Connections,
 
 	    %% Now try one more than alowed:
-	    ct:pal("Info Report might come here...",[]),
+	    ct:log("Info Report might come here...",[]),
 	    try Connect(Host,Port)
 	    of
 		_ConnectionRef1 ->
@@ -1921,12 +1921,12 @@ basic_test(Config) ->
 do_shell(IO, Shell) ->
     receive
 	ErlPrompt0 ->
-	    ct:pal("Erlang prompt: ~p~n", [ErlPrompt0])
+	    ct:log("Erlang prompt: ~p~n", [ErlPrompt0])
     end,
     IO ! {input, self(), "1+1.\r\n"},
      receive
 	Echo0 ->
-	     ct:pal("Echo: ~p ~n", [Echo0])
+	     ct:log("Echo: ~p ~n", [Echo0])
     end,
     receive
 	?NEWLINE ->
@@ -1934,7 +1934,7 @@ do_shell(IO, Shell) ->
     end,
     receive
 	Result0 = <<"2">> ->
-	    ct:pal("Result: ~p~n", [Result0])
+	    ct:log("Result: ~p~n", [Result0])
     end,
     receive
 	?NEWLINE ->
@@ -1942,7 +1942,7 @@ do_shell(IO, Shell) ->
     end,
     receive
 	ErlPrompt1 ->
-	    ct:pal("Erlang prompt: ~p~n", [ErlPrompt1])
+	    ct:log("Erlang prompt: ~p~n", [ErlPrompt1])
     end,
     exit(Shell, kill).
     %%Does not seem to work in the testserver!
@@ -1953,7 +1953,7 @@ do_shell(IO, Shell) ->
     %% end,
     %% receive
     %%  	Echo1 ->
-    %% 	    ct:pal("Echo: ~p ~n", [Echo1])
+    %% 	    ct:log("Echo: ~p ~n", [Echo1])
     %% end,
     %% receive
     %% 	?NEWLINE ->
@@ -1961,7 +1961,7 @@ do_shell(IO, Shell) ->
     %% end,
     %% receive
     %%  	Result1 ->
-    %%  	    ct:pal("Result: ~p~n", [Result1])
+    %%  	    ct:log("Result: ~p~n", [Result1])
     %%      end,
     %% receive
     %% 	{'EXIT', Shell, killed} ->
@@ -1975,13 +1975,13 @@ wait_for_erlang_first_line(Config) ->
 	{'EXIT', _, _} ->
 	    {fail,no_ssh_connection};
 	<<"Eshell ",_/binary>> = _ErlShellStart ->
-	    ct:pal("Erlang shell start: ~p~n", [_ErlShellStart]),
+	    ct:log("Erlang shell start: ~p~n", [_ErlShellStart]),
 	    Config;
 	Other ->
-	    ct:pal("Unexpected answer from ssh server: ~p",[Other]),
+	    ct:log("Unexpected answer from ssh server: ~p",[Other]),
 	    {fail,unexpected_answer}
     after 10000 ->
-	    ct:pal("No answer from ssh-server"),
+	    ct:log("No answer from ssh-server"),
 	    {fail,timeout}
     end.
 
@@ -1997,7 +1997,7 @@ new_do_shell(IO, N, Ops=[{Order,Arg}|More]) ->
     PfxSize = size(Pfx),
     receive
 	_X = <<"\r\n">> ->
-	    ct:pal("Skip newline ~p",[_X]),
+	    ct:log("Skip newline ~p",[_X]),
 	    new_do_shell(IO, N, Ops);
 	
 	<<Pfx:PfxSize/binary,P1,"> ">> when (P1-$0)==N -> 
@@ -2013,15 +2013,15 @@ new_do_shell(IO, N, Ops=[{Order,Arg}|More]) ->
 	    ct:fail("new_do_shell error: ~p~n",[Err]);
 
 	RecBin when Order==expect ; Order==expect_echo ->
-	    ct:pal("received ~p",[RecBin]),
+	    ct:log("received ~p",[RecBin]),
 	    RecStr = string:strip(unicode:characters_to_list(RecBin)),
 	    ExpStr = string:strip(Arg),
 	    case lists:prefix(ExpStr, RecStr) of
 		true when Order==expect ->
-		    ct:pal("Matched ~ts",[RecStr]),
+		    ct:log("Matched ~ts",[RecStr]),
 		    new_do_shell(IO, N, More);
 		true when Order==expect_echo ->
-		    ct:pal("Matched echo ~ts",[RecStr]),
+		    ct:log("Matched echo ~ts",[RecStr]),
 		    new_do_shell(IO, N, More);
 		false ->
 		    ct:fail("*** Expected ~p, but got ~p",[string:strip(ExpStr),RecStr])
@@ -2047,12 +2047,12 @@ prompt_prefix() ->
 	    
 
 new_do_shell_prompt(IO, N, type, Str, More) ->
-    ct:pal("Matched prompt ~p to trigger sending of next line to server",[N]),
+    ct:log("Matched prompt ~p to trigger sending of next line to server",[N]),
     IO ! {input, self(), Str++"\r\n"},
-    ct:pal("Promt '~p> ', Sent ~ts",[N,Str++"\r\n"]),
+    ct:log("Promt '~p> ', Sent ~ts",[N,Str++"\r\n"]),
     new_do_shell(IO, N, [{expect_echo,Str}|More]); % expect echo of the sent line
 new_do_shell_prompt(IO, N, Op, Str, More) ->
-    ct:pal("Matched prompt ~p",[N]),
+    ct:log("Matched prompt ~p",[N]),
     new_do_shell(IO, N, [{Op,Str}|More]).
   
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index eb7c641d8a..fbcf06290a 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -186,7 +186,7 @@ big_cat(Config) when is_list(Config) ->
     %% pre-adjust receive window so the other end doesn't block
     ssh_connection:adjust_window(ConnectionRef, ChannelId0, size(Data)),
 
-    ct:pal("sending ~p byte binary~n",[size(Data)]),
+    ct:log("sending ~p byte binary~n",[size(Data)]),
     ok = ssh_connection:send(ConnectionRef, ChannelId0, Data, 10000),
     ok = ssh_connection:send_eof(ConnectionRef, ChannelId0),
 
@@ -197,10 +197,10 @@ big_cat(Config) when is_list(Config) ->
 	{ok, Other} ->
 	    case size(Data) =:= size(Other) of
 		true ->
-		    ct:pal("received and sent data are same"
+		    ct:log("received and sent data are same"
 			   "size but do not match~n",[]);
 		false ->
-		    ct:pal("sent ~p but only received ~p~n",
+		    ct:log("sent ~p but only received ~p~n",
 			   [size(Data), size(Other)])
 	    end,
 	    ct:fail(receive_data_mismatch);
@@ -450,7 +450,7 @@ gracefull_invalid_version(Config) when is_list(Config) ->
     ok = gen_tcp:send(S,  ["SSH-8.-1","\r\n"]),
     receive
 	Verstring ->
-	    ct:pal("Server version: ~p~n", [Verstring]),
+	    ct:log("Server version: ~p~n", [Verstring]),
 	    receive
 		{tcp_closed, S} ->
 		    ok
@@ -470,7 +470,7 @@ gracefull_invalid_start(Config) when is_list(Config) ->
     ok = gen_tcp:send(S,  ["foobar","\r\n"]),
     receive
 	Verstring ->
-	    ct:pal("Server version: ~p~n", [Verstring]),
+	    ct:log("Server version: ~p~n", [Verstring]),
 	    receive
 		{tcp_closed, S} ->
 		    ok
@@ -490,7 +490,7 @@ gracefull_invalid_long_start(Config) when is_list(Config) ->
     ok = gen_tcp:send(S, [lists:duplicate(257, $a), "\r\n"]),
     receive
 	Verstring ->
-	    ct:pal("Server version: ~p~n", [Verstring]),
+	    ct:log("Server version: ~p~n", [Verstring]),
 	    receive
 		{tcp_closed, S} ->
 		    ok
@@ -511,7 +511,7 @@ gracefull_invalid_long_start_no_nl(Config) when is_list(Config) ->
     ok = gen_tcp:send(S, [lists:duplicate(257, $a), "\r\n"]),
     receive
 	Verstring ->
-	    ct:pal("Server version: ~p~n", [Verstring]),
+	    ct:log("Server version: ~p~n", [Verstring]),
 	    receive
 		{tcp_closed, S} ->
 		    ok
diff --git a/lib/ssh/test/ssh_protocol_SUITE.erl b/lib/ssh/test/ssh_protocol_SUITE.erl
index 246e3d4898..dc02b940d7 100644
--- a/lib/ssh/test/ssh_protocol_SUITE.erl
+++ b/lib/ssh/test/ssh_protocol_SUITE.erl
@@ -240,7 +240,7 @@ lib_no_match(_Config) ->
 no_common_alg_server_disconnects(Config) ->
     {ok,_} =
 	ssh_trpt_test_lib:exec(
-	  [{set_options, [print_ops, print_seqnums, print_messages]},
+	  [{set_options, [print_ops, {print_messages,detail}]},
 	   {connect,
 	    server_host(Config),server_port(Config),
 	    [{silently_accept_hosts, true},
@@ -251,7 +251,7 @@ no_common_alg_server_disconnects(Config) ->
 	   receive_hello,
 	   {send, hello},
 	   {match, #ssh_msg_kexinit{_='_'}, receive_msg},
-	   {send, ssh_msg_kexinit},
+	   {send, ssh_msg_kexinit},  % with server unsupported 'ssh-dss' !
 	   {match,
 	    {'or',[#ssh_msg_disconnect{code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,  _='_'},
                   tcp_closed]},
@@ -275,17 +275,16 @@ no_common_alg_client_disconnects(Config) ->
 		  Parent !
 		      {result,self(),
 		       ssh_trpt_test_lib:exec(
-			 [{set_options, [print_ops, print_messages]},
+			 [{set_options, [print_ops, {print_messages,detail}]},
 			  {accept, [{system_dir, system_dir(Config)},
 				    {user_dir, user_dir(Config)}]},
 			  receive_hello,
 			  {send, hello},
-
 			  {match, #ssh_msg_kexinit{_='_'}, receive_msg},
-			  {send,  #ssh_msg_kexinit{
+			  {send,  #ssh_msg_kexinit{ % with unsupported "SOME-UNSUPPORTED"
 				     cookie = 247381486335508958743193106082599558706,
 				     kex_algorithms = ["diffie-hellman-group1-sha1"],
-				     server_host_key_algorithms = ["some-unknown"],
+				     server_host_key_algorithms = ["SOME-UNSUPPORTED"],  % SIC!
 				     encryption_algorithms_client_to_server = ["aes128-ctr"],
 				     encryption_algorithms_server_to_client = ["aes128-ctr"],
 				     mac_algorithms_client_to_server = ["hmac-sha2-256"],
@@ -306,7 +305,8 @@ no_common_alg_client_disconnects(Config) ->
 		      }
 	  end),
 
-    %% and finally connect to it with a regular Erlang SSH client:
+    %% and finally connect to it with a regular Erlang SSH client
+    %% which of course does not support SOME-UNSUPPORTED as pub key algo:
     Result = std_connect(HostPort, Config, [{preferred_algorithms,[{public_key,['ssh-dss']}]}]),
     ct:log("Result of connect is ~p",[Result]),
 
@@ -314,10 +314,12 @@ no_common_alg_client_disconnects(Config) ->
 	{result,Pid,{ok,_}} -> 
 	    ok;
 	{result,Pid,{error,{Op,ExecResult,S}}} ->
-	    ct:pal("ERROR!~nOp = ~p~nExecResult = ~p~nState =~n~s",
+	    ct:log("ERROR!~nOp = ~p~nExecResult = ~p~nState =~n~s",
 		   [Op,ExecResult,ssh_trpt_test_lib:format_msg(S)]),
 	    {fail, ExecResult};
-	X -> ct:fail(X)
+	X -> 
+	    ct:log("¤¤¤¤¤"),
+	    ct:fail(X)
     end.
 
 %%%--------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl
index a95e16a0b3..bab5bf9fe9 100644
--- a/lib/ssh/test/ssh_sftp_SUITE.erl
+++ b/lib/ssh/test/ssh_sftp_SUITE.erl
@@ -47,7 +47,7 @@ init_per_suite(Config) ->
     catch crypto:stop(),
     case (catch crypto:start()) of
 	ok ->
-	    ct:pal("file:native_name_encoding() = ~p,~nio:getopts() = ~p",
+	    ct:log("file:native_name_encoding() = ~p,~nio:getopts() = ~p",
 		   [file:native_name_encoding(),io:getopts()]),
 	    ssh:start(),
 	    Config;
@@ -85,7 +85,12 @@ groups() ->
      {openssh_server, [], [{group,write_read_tests},
 			   {group,remote_tar}]},
 
-     {remote_tar, [], [create_empty_tar, files_to_tar, big_file_to_tar, files_chunked_to_tar,
+     {remote_tar, [], [create_empty_tar, 
+		       ascii_filename_ascii_contents_to_tar,
+		       ascii_filename_unicode_contents_to_tar,
+		       unicode_filename_ascii_contents_to_tar,
+		       files_to_tar,
+		       big_file_to_tar, files_chunked_to_tar,
 		       directory_to_tar, binaries_to_tar, null_crypto_tar, 
 		       simple_crypto_tar_small, simple_crypto_tar_big,
 		       read_tar, read_null_crypto_tar, read_crypto_tar, 
@@ -121,23 +126,35 @@ init_per_group(unicode, Config) ->
 	    ct:comment("Begin ~p",[grps(Config)]),
 	    DataDir = ?config(data_dir, Config),
 	    PrivDir = ?config(priv_dir, Config),
-	    [{user, "åke高兴"},
-	     {passwd, "ärlig日本じん"},
-	     {data, <<"foobar å 一二三四いちにさんち">>},
-	     {filename, filename:join(PrivDir, "sftp瑞点.txt")},
-	     {testfile, filename:join(PrivDir, "testハンス.txt")},
-	     {linktest, filename:join(PrivDir, "link_test語.txt")},
-	     {tar_filename, filename:join(PrivDir,  "sftp_tar_test一二三.tar")},
-	     {tar_F1_txt, "F一.txt"},
-	     {datadir_tar, filename:join(DataDir,"sftp_tar_test_data_高兴")}
-	     | lists:foldl(fun(K,Cf) -> lists:keydelete(K,1,Cf) end, 
-			   Config,
-			   [user, passwd, data,
-			    filename, testfile, linktest,
-			    tar_filename, tar_F1_txt, datadir_tar
-			   ]
-			  )
-	    ];
+	    NewConfig =
+		[{user, "åke高兴"},
+		 {passwd, "ärlig日本じん"},
+		 {data, <<"foobar å 一二三四いちにさんち">>},
+		 {filename, filename:join(PrivDir, "sftp瑞点.txt")},
+		 {testfile, filename:join(PrivDir, "testハンス.txt")},
+		 {linktest, filename:join(PrivDir, "link_test語.txt")},
+		 {tar_filename, filename:join(PrivDir,  "sftp_tar_test一二三.tar")},
+		 {tar_F1_txt, "F一.txt"},
+		 {tar_F3_txt, "f3.txt"},
+		 {tar_F4_txt, "g四.txt"},
+		 {datadir_tar, filename:join(DataDir,"sftp_tar_test_data_高兴")}
+		 | lists:foldl(fun(K,Cf) -> lists:keydelete(K,1,Cf) end, 
+			       Config,
+			       [user, passwd, data,
+				filename, testfile, linktest,
+				tar_filename, tar_F1_txt, datadir_tar
+			       ]
+			      )
+		],
+	    FN = fn(?config(tar_F1_txt,NewConfig), NewConfig),
+	    case catch file:read_file(FN) of
+		{ok,FN_contents} ->
+		    ct:log("Readable file:read_file(~tp) ->~n~tp",[FN,FN_contents]),
+		    NewConfig;
+		Other ->
+		    ct:log("Unreadable file:read_file(~tp) ->~n~p",[FN,Other]),
+		    {skip, "Not unicode file reading"}
+	    end;
 
 	_ ->
 	    {skip, "Not unicode file encoding"}
@@ -380,7 +397,7 @@ read_dir(Config) when is_list(Config) ->
     PrivDir = ?config(priv_dir, Config),
     {Sftp, _} = ?config(sftp, Config),
     {ok, Files} = ssh_sftp:list_dir(Sftp, PrivDir),
-    ct:pal("sftp list dir: ~p~n", [Files]).
+    ct:log("sftp list dir: ~p~n", [Files]).
 
 %%--------------------------------------------------------------------
 write_file() ->
@@ -461,12 +478,12 @@ rename_file(Config) when is_list(Config) ->
 
     {Sftp, _} = ?config(sftp, Config),
     {ok, Files} = ssh_sftp:list_dir(Sftp, PrivDir),
-    ct:pal("FileName: ~p, Files: ~p~n", [FileName, Files]),
+    ct:log("FileName: ~p, Files: ~p~n", [FileName, Files]),
     true = lists:member(filename:basename(FileName), Files),
     false = lists:member(filename:basename(NewFileName), Files),
     ok = ssh_sftp:rename(Sftp, FileName, NewFileName),
     {ok, NewFiles} = ssh_sftp:list_dir(Sftp, PrivDir),
-    ct:pal("FileName: ~p, Files: ~p~n", [FileName, NewFiles]),
+    ct:log("FileName: ~p, Files: ~p~n", [FileName, NewFiles]),
 
     false = lists:member(filename:basename(FileName), NewFiles),
     true = lists:member(filename:basename(NewFileName), NewFiles).
@@ -512,7 +529,7 @@ retrieve_attributes(Config) when is_list(Config) ->
     {ok, NewFileInfo} = file:read_file_info(FileName),
 
     %% TODO comparison. There are some differences now is that ok?
-    ct:pal("SFTP: ~p   FILE: ~p~n", [FileInfo, NewFileInfo]).
+    ct:log("SFTP: ~p   FILE: ~p~n", [FileInfo, NewFileInfo]).
 
 %%--------------------------------------------------------------------
 set_attributes() ->
@@ -541,7 +558,7 @@ async_read(Config) when is_list(Config) ->
 
     receive
 	{async_reply, Ref, {ok, Data}} ->
-	    ct:pal("Data: ~p~n", [Data]),
+	    ct:log("Data: ~p~n", [Data]),
 	    ok;
 	Msg ->
 	    ct:fail(Msg)
@@ -686,6 +703,43 @@ files_to_tar(Config) ->
     chk_tar([F1, "f2.txt"], Config).
 
 %%--------------------------------------------------------------------
+ascii_filename_ascii_contents_to_tar(Config) ->
+    ChPid2 = ?config(channel_pid2, Config),
+    TarFileName = ?config(tar_filename, Config),
+    {ok,Handle} = ssh_sftp:open_tar(ChPid2, TarFileName, [write]),
+    ok = erl_tar:add(Handle, fn("f2.txt",Config), "f2.txt", [verbose]),
+    ok = erl_tar:close(Handle),
+    chk_tar(["f2.txt"], Config).
+
+%%--------------------------------------------------------------------
+ascii_filename_unicode_contents_to_tar(Config) ->
+    case ?config(tar_F3_txt, Config) of
+	undefined ->
+	    {skip, "Unicode test"};
+	Fn ->
+	    ChPid2 = ?config(channel_pid2, Config),
+	    TarFileName = ?config(tar_filename, Config),
+	    {ok,Handle} = ssh_sftp:open_tar(ChPid2, TarFileName, [write]),
+	    ok = erl_tar:add(Handle, fn(Fn,Config), Fn, [verbose]),
+	    ok = erl_tar:close(Handle),
+	    chk_tar([Fn], Config)
+    end.
+
+%%--------------------------------------------------------------------
+unicode_filename_ascii_contents_to_tar(Config) ->
+    case ?config(tar_F4_txt, Config) of
+	undefined ->
+	    {skip, "Unicode test"};
+	Fn ->
+	    ChPid2 = ?config(channel_pid2, Config),
+	    TarFileName = ?config(tar_filename, Config),
+	    {ok,Handle} = ssh_sftp:open_tar(ChPid2, TarFileName, [write]),
+	    ok = erl_tar:add(Handle, fn(Fn,Config), Fn, [verbose]),
+	    ok = erl_tar:close(Handle),
+	    chk_tar([Fn], Config)
+    end.
+
+%%--------------------------------------------------------------------
 big_file_to_tar(Config) ->
     ChPid2 = ?config(channel_pid2, Config),
     TarFileName = ?config(tar_filename, Config),
diff --git a/lib/ssh/test/ssh_sftp_SUITE_data/sftp_tar_test_data_高兴/f3.txt b/lib/ssh/test/ssh_sftp_SUITE_data/sftp_tar_test_data_高兴/f3.txt
new file mode 100644
index 0000000000..e6076a05b5
--- /dev/null
+++ b/lib/ssh/test/ssh_sftp_SUITE_data/sftp_tar_test_data_高兴/f3.txt
@@ -0,0 +1 @@
+你好
diff --git a/lib/ssh/test/ssh_sftp_SUITE_data/sftp_tar_test_data_高兴/g四.txt b/lib/ssh/test/ssh_sftp_SUITE_data/sftp_tar_test_data_高兴/g四.txt
new file mode 100644
index 0000000000..d18c6b11fc
--- /dev/null
+++ b/lib/ssh/test/ssh_sftp_SUITE_data/sftp_tar_test_data_高兴/g四.txt
@@ -0,0 +1 @@
+How are you?
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl
index f38fcc5521..94a54ec9db 100644
--- a/lib/ssh/test/ssh_sftpd_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_SUITE.erl
@@ -152,7 +152,7 @@ init_per_testcase(TestCase, Config) ->
     {ok, <<?SSH_FXP_VERSION, ?UINT32(Version), _Ext/binary>>, _}
 	= reply(Cm, Channel),
 
-    ct:pal("Client: ~p Server ~p~n", [ProtocolVer, Version]),
+    ct:log("Client: ~p Server ~p~n", [ProtocolVer, Version]),
 
     [{sftp, {Cm, Channel}}, {sftpd, Sftpd }| Config].
 
@@ -418,7 +418,7 @@ real_path(Config) when is_list(Config) ->
 	    RealPath = filename:absname(binary_to_list(Path)),
 	    AbsPrivDir = filename:absname(PrivDir),
 
-	    ct:pal("Path: ~p PrivDir: ~p~n", [RealPath, AbsPrivDir]),
+	    ct:log("Path: ~p PrivDir: ~p~n", [RealPath, AbsPrivDir]),
 
 	    true = RealPath == AbsPrivDir
     end.
@@ -447,7 +447,7 @@ links(Config) when is_list(Config) ->
 
 	    true = binary_to_list(Path) == FileName,
 
-	    ct:pal("Path: ~p~n", [binary_to_list(Path)])
+	    ct:log("Path: ~p~n", [binary_to_list(Path)])
     end.
 
 %%--------------------------------------------------------------------
@@ -548,10 +548,10 @@ set_attributes(Config) when is_list(Config) ->
 	    %% Can not test that NewPermissions = Permissions as
 	    %% on Unix platforms, other bits than those listed in the
 	    %% API may be set.
-	    ct:pal("Org: ~p New: ~p~n", [OrigPermissions, NewPermissions]),
+	    ct:log("Org: ~p New: ~p~n", [OrigPermissions, NewPermissions]),
 	    true = OrigPermissions =/= NewPermissions,
 
-	    ct:pal("Try to open the file"),
+	    ct:log("Try to open the file"),
 	    NewReqId = 2,
 	    {ok, <<?SSH_FXP_HANDLE, ?UINT32(NewReqId), Handle/binary>>, _} =
 		open_file(FileName, Cm, Channel, NewReqId,
@@ -563,7 +563,7 @@ set_attributes(Config) when is_list(Config) ->
 
 	    NewReqId1 = 3,
 
-	    ct:pal("Set original permissions on the now open file"),
+	    ct:log("Set original permissions on the now open file"),
 
 	    {ok, <<?SSH_FXP_STATUS, ?UINT32(NewReqId1),
 		   ?UINT32(?SSH_FX_OK), _/binary>>, _} =
@@ -786,7 +786,7 @@ read_dir(Handle, Cm, Channel, ReqId) ->
     case reply(Cm, Channel) of
 	{ok, <<?SSH_FXP_NAME, ?UINT32(ReqId), ?UINT32(Count),
 	       ?UINT32(Len), Listing:Len/binary, _/binary>>, _} ->
-	    ct:pal("Count: ~p Listing: ~p~n",
+	    ct:log("Count: ~p Listing: ~p~n",
 			       [Count, binary_to_list(Listing)]),
 	    read_dir(Handle, Cm, Channel, ReqId);
 	{ok, <<?SSH_FXP_STATUS, ?UINT32(ReqId),
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
index 321e3546cf..7a025a6518 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
@@ -159,7 +159,7 @@ close_file(Config) when is_list(Config) ->
 
     NumOfPorts = length(erlang:ports()),
 
-    ct:pal("Number of open ports:  ~p~n", [NumOfPorts]),
+    ct:log("Number of open ports:  ~p~n", [NumOfPorts]),
 
     {ok, <<_/binary>>} = ssh_sftp:read_file(Sftp, FileName),
 
@@ -255,14 +255,14 @@ root_dir(Config) when is_list(Config) ->
     {ok, Bin} = ssh_sftp:read_file(Sftp, FileName),
     {ok, Listing} =
 	ssh_sftp:list_dir(Sftp, "."),
-    ct:pal("Listing: ~p~n", [Listing]).
+    ct:log("Listing: ~p~n", [Listing]).
 
 %%--------------------------------------------------------------------
 list_dir_limited(Config) when is_list(Config) ->
     {Sftp, _} = ?config(sftp, Config),
     {ok, Listing} =
 	ssh_sftp:list_dir(Sftp, "."),
-    ct:pal("Listing: ~p~n", [Listing]).
+    ct:log("Listing: ~p~n", [Listing]).
 
 %%--------------------------------------------------------------------
 ver6_basic() ->
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 97c35e549c..988ea47bd8 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -97,10 +97,10 @@ loop_io_server(TestCase, Buff0) ->
 	 {input, TestCase, Line} ->
 	     loop_io_server(TestCase, Buff0 ++ [Line]);
 	 {io_request, From, ReplyAs, Request} ->
-%%ct:pal("~p",[{io_request, From, ReplyAs, Request}]),
+%%ct:log("~p",[{io_request, From, ReplyAs, Request}]),
 	     {ok, Reply, Buff} = io_request(Request, TestCase, From,
 					    ReplyAs, Buff0),
-%%ct:pal("io_request(~p)-->~p",[Request,{ok, Reply, Buff}]),
+%%ct:log("io_request(~p)-->~p",[Request,{ok, Reply, Buff}]),
 	     io_reply(From, ReplyAs, Reply),
 	     loop_io_server(TestCase, Buff);
 	 {'EXIT',_, _} ->
@@ -134,26 +134,26 @@ io_request({get_line, _Enc,_}, _, _, _, [Line | Buff]) ->
 io_reply(_, _, []) ->
     ok;
 io_reply(From, ReplyAs, Reply) ->
-%%ct:pal("io_reply ~p sending ~p ! ~p",[self(),From, {io_reply, ReplyAs, Reply}]),
+%%ct:log("io_reply ~p sending ~p ! ~p",[self(),From, {io_reply, ReplyAs, Reply}]),
     From ! {io_reply, ReplyAs, Reply}.
 
 reply(_, []) ->
     ok;
 reply(TestCase, Result) ->
-%%ct:pal("reply ~p sending ~p ! ~p",[self(), TestCase, Result]),
+%%ct:log("reply ~p sending ~p ! ~p",[self(), TestCase, Result]),
     TestCase ! Result.
 
 receive_exec_result(Msg) ->
-    ct:pal("Expect data! ~p", [Msg]),
+    ct:log("Expect data! ~p", [Msg]),
     receive
 	{ssh_cm,_,{data,_,1, Data}} ->
-	    ct:pal("StdErr: ~p~n", [Data]),
+	    ct:log("StdErr: ~p~n", [Data]),
 	    receive_exec_result(Msg);
 	Msg ->
-	    ct:pal("1: Collected data ~p", [Msg]),
+	    ct:log("1: Collected data ~p", [Msg]),
 	    expected;
 	Other ->
-	    ct:pal("Other ~p", [Other]),
+	    ct:log("Other ~p", [Other]),
 	    {unexpected_msg, Other}
     end.
 
@@ -165,15 +165,15 @@ receive_exec_end(ConnectionRef, ChannelId) ->
     case receive_exec_result(ExitStatus) of
 	{unexpected_msg, Eof} -> %% Open ssh seems to not allways send these messages
 	    %% in the same order!
-	    ct:pal("2: Collected data ~p", [Eof]),
+	    ct:log("2: Collected data ~p", [Eof]),
 	    case receive_exec_result(ExitStatus) of
 		expected ->
 		    expected = receive_exec_result(Closed);
 		{unexpected_msg, Closed} ->
-		    ct:pal("3: Collected data ~p", [Closed])
+		    ct:log("3: Collected data ~p", [Closed])
 	    end;
 	expected ->
-	    ct:pal("4: Collected data ~p", [ExitStatus]),
+	    ct:log("4: Collected data ~p", [ExitStatus]),
 	    expected = receive_exec_result(Eof),
 	    expected = receive_exec_result(Closed);
 	Other ->
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index fb1c6a1b61..06bf264033 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -148,7 +148,7 @@ erlang_client_openssh_server_exec(Config) when is_list(Config) ->
 	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId0);
 	{unexpected_msg,{ssh_cm, ConnectionRef, {exit_status, ChannelId0, 0}}
 	 = ExitStatus0} ->
-	    ct:pal("0: Collected data ~p", [ExitStatus0]),
+	    ct:log("0: Collected data ~p", [ExitStatus0]),
 	    ssh_test_lib:receive_exec_result(Data0,
 					     ConnectionRef, ChannelId0);
 	Other0 ->
@@ -164,7 +164,7 @@ erlang_client_openssh_server_exec(Config) when is_list(Config) ->
 	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId1);
 	{unexpected_msg,{ssh_cm, ConnectionRef, {exit_status, ChannelId1, 0}}
 	 = ExitStatus1} ->
-	    ct:pal("0: Collected data ~p", [ExitStatus1]),
+	    ct:log("0: Collected data ~p", [ExitStatus1]),
 	    ssh_test_lib:receive_exec_result(Data1,
 					     ConnectionRef, ChannelId1);
 	Other1 ->
@@ -190,7 +190,7 @@ erlang_client_openssh_server_exec_compressed(Config) when is_list(Config) ->
 	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId);
 	{unexpected_msg,{ssh_cm, ConnectionRef,
 			 {exit_status, ChannelId, 0}} = ExitStatus} ->
-	    ct:pal("0: Collected data ~p", [ExitStatus]),
+	    ct:log("0: Collected data ~p", [ExitStatus]),
 	    ssh_test_lib:receive_exec_result(Data,  ConnectionRef, ChannelId);
 	Other ->
 	    ct:fail(Other)
@@ -223,11 +223,11 @@ erlang_client_openssh_server_kexs(Config) when is_list(Config) ->
 			  Acc;
 		      {unexpected_msg,{ssh_cm, ConnectionRef,
 				       {exit_status, ChannelId, 0}} = ExitStatus} ->
-			  ct:pal("0: Collected data ~p", [ExitStatus]),
+			  ct:log("0: Collected data ~p", [ExitStatus]),
 			  ssh_test_lib:receive_exec_result(ExpectedData,  ConnectionRef, ChannelId),
 			  Acc;
 		      Other ->
-			  ct:pal("~p failed: ~p",[Kex,Other]),
+			  ct:log("~p failed: ~p",[Kex,Other]),
 			  false
 		  end
 	  end, true, ssh_transport:supported_algorithms(kex)),
@@ -256,7 +256,7 @@ erlang_server_openssh_client_exec(Config) when is_list(Config) ->
     Cmd = "ssh -p " ++ integer_to_list(Port) ++
 	" -o UserKnownHostsFile=" ++ KnownHosts ++ " " ++ Host ++ " 1+1.",
 
-    ct:pal("Cmd: ~p~n", [Cmd]),
+    ct:log("Cmd: ~p~n", [Cmd]),
 
     SshPort = open_port({spawn, Cmd}, [binary]),
 
@@ -297,7 +297,7 @@ erlang_server_openssh_client_cipher_suites(Config) when is_list(Config) ->
         " -o UserKnownHostsFile=" ++ KnownHosts ++ " " ++ Host ++ " " ++
         " -c " ++ Cipher ++ " 1+1.",
 
-        ct:pal("Cmd: ~p~n", [Cmd]),
+        ct:log("Cmd: ~p~n", [Cmd]),
 
         SshPort = open_port({spawn, Cmd}, [binary, stderr_to_stdout]),
 
@@ -347,7 +347,7 @@ erlang_server_openssh_client_macs(Config) when is_list(Config) ->
         " -o UserKnownHostsFile=" ++ KnownHosts ++ " " ++ Host ++ " " ++
         " -o MACs=" ++ MAC ++ " 1+1.",
 
-        ct:pal("Cmd: ~p~n", [Cmd]),
+        ct:log("Cmd: ~p~n", [Cmd]),
 
         SshPort = open_port({spawn, Cmd}, [binary, stderr_to_stdout]),
 
@@ -401,7 +401,7 @@ erlang_server_openssh_client_kexs(Config) when is_list(Config) ->
 		      " -o UserKnownHostsFile=" ++ KnownHosts ++ " " ++ Host ++ " " ++
 		      " -o KexAlgorithms=" ++ Kex ++ " 1+1.",
 
-		  ct:pal("Cmd: ~p~n", [Cmd]),
+		  ct:log("Cmd: ~p~n", [Cmd]),
 
 		  SshPort = open_port({spawn, Cmd}, [binary, stderr_to_stdout]),
 
@@ -411,7 +411,7 @@ erlang_server_openssh_client_kexs(Config) when is_list(Config) ->
 			      {SshPort,{data, <<"2\n">>}} ->
 				  Acc
 			  after ?TIMEOUT ->
-				  ct:pal("Did not receive answer for ~p",[Kex]),
+				  ct:log("Did not receive answer for ~p",[Kex]),
 				  false
 			  end;
 		      false ->
@@ -419,7 +419,7 @@ erlang_server_openssh_client_kexs(Config) when is_list(Config) ->
 			      {SshPort,{data, <<"Unable to negotiate a key exchange method", _/binary>>}} ->
 				  Acc
 			  after ?TIMEOUT ->
-				  ct:pal("Did not receive no matching kex message for ~p",[Kex]),
+				  ct:log("Did not receive no matching kex message for ~p",[Kex]),
 				  false
 			  end
 		  end
@@ -494,11 +494,11 @@ erlang_client_openssh_server_setenv(Config) when is_list(Config) ->
 			 {data,0,1, UnxpectedData}}} ->
 	    %% Some os may return things as
 	    %% ENV_TEST: Undefined variable.\n"
-	    ct:pal("UnxpectedData: ~p", [UnxpectedData]),
+	    ct:log("UnxpectedData: ~p", [UnxpectedData]),
 	    ssh_test_lib:receive_exec_end(ConnectionRef, ChannelId);
 	{unexpected_msg,{ssh_cm, ConnectionRef, {exit_status, ChannelId, 0}}
 	 = ExitStatus} ->
-	    ct:pal("0: Collected data ~p", [ExitStatus]),
+	    ct:log("0: Collected data ~p", [ExitStatus]),
 	    ssh_test_lib:receive_exec_result(Data,
 					     ConnectionRef, ChannelId);
 	Other ->
@@ -601,7 +601,7 @@ erlang_client_openssh_server_password(Config) when is_list(Config) ->
 						 {user_interaction, false},
 						 {user_dir, UserDir}]),
     
-    ct:pal("Test of user foo that does not exist. "
+    ct:log("Test of user foo that does not exist. "
 		       "Error msg: ~p~n", [Reason0]),
 
     User = string:strip(os:cmd("whoami"), right, $\n),
@@ -615,10 +615,10 @@ erlang_client_openssh_server_password(Config) when is_list(Config) ->
 			     {password, "foo"},
 			     {user_interaction, false},
 			     {user_dir, UserDir}]),
-	    ct:pal("Test of wrong Pasword.  "
+	    ct:log("Test of wrong Pasword.  "
 			       "Error msg: ~p~n", [Reason1]);
 	_ ->
-	    ct:pal("Whoami failed reason: ~n", [])
+	    ct:log("Whoami failed reason: ~n", [])
 	end.
 
 %%--------------------------------------------------------------------
@@ -646,19 +646,19 @@ erlang_client_openssh_server_nonexistent_subsystem(Config) when is_list(Config)
 receive_hej() ->
     receive
 	<<"Hej", _binary>> = Hej ->
-	    ct:pal("Expected result: ~p~n", [Hej]);
+	    ct:log("Expected result: ~p~n", [Hej]);
 	<<"Hej\n", _binary>> = Hej ->
-	    ct:pal("Expected result: ~p~n", [Hej]);
+	    ct:log("Expected result: ~p~n", [Hej]);
 	<<"Hej\r\n", _/binary>> = Hej ->
-	    ct:pal("Expected result: ~p~n", [Hej]);
+	    ct:log("Expected result: ~p~n", [Hej]);
 	Info ->
 	    Lines = binary:split(Info, [<<"\r\n">>], [global]),
 	    case lists:member(<<"Hej">>, Lines) of
 		true ->
-		    ct:pal("Expected result found in lines: ~p~n", [Lines]),
+		    ct:log("Expected result found in lines: ~p~n", [Lines]),
 		    ok;
 		false ->
-		    ct:pal("Extra info: ~p~n", [Info]),
+		    ct:log("Extra info: ~p~n", [Info]),
 		    receive_hej()
 	    end
     end.
@@ -672,7 +672,7 @@ receive_logout() ->
 		    ok
 	    end;
 	Info ->
-	    ct:pal("Extra info when logging out: ~p~n", [Info]),
+	    ct:log("Extra info when logging out: ~p~n", [Info]),
 	    receive_logout()
 	end.
 
@@ -715,6 +715,6 @@ check_ssh_client_support2(P) ->
 	{P, {exit_status, E}} ->
 	    E
     after 5000 ->
-	    ct:pal("Openssh command timed out ~n"),
+	    ct:log("Openssh command timed out ~n"),
 	    -1
     end.
diff --git a/lib/ssh/test/ssh_trpt_test_lib.erl b/lib/ssh/test/ssh_trpt_test_lib.erl
index 75f495b6d7..38b2789742 100644
--- a/lib/ssh/test/ssh_trpt_test_lib.erl
+++ b/lib/ssh/test/ssh_trpt_test_lib.erl
@@ -42,8 +42,8 @@
 	  seen_hello = false,
 	  enc = <<>>,
 	  ssh = #ssh{},				% #ssh{}
-	  own_kexinit,
-	  peer_kexinit,
+	  alg_neg = {undefined,undefined},      % {own_kexinit, peer_kexinit}
+	  alg,                                  % #alg{}
 	  vars = dict:new(),
 	  reply = [],				% Some repy msgs are generated hidden in ssh_transport :[
 	  prints = [],
@@ -140,7 +140,10 @@ op(receive_hello, S0) when S0#s.seen_hello =/= true ->
 op(receive_msg, S) when S#s.seen_hello == true ->
     try recv(S)
     catch
-	{tcp,Exc} -> S#s{return_value=Exc}
+	{tcp,Exc} -> 
+	    S1 = opt(print_messages, S, 
+		     fun(X) when X==true;X==detail -> {"Recv~n~p~n",[Exc]} end),
+	    S1#s{return_value=Exc}
     end;
 
 
@@ -206,6 +209,9 @@ op_val(E, S0) ->
     end.
 
 
+fail(Reason, {Fmt,Args}, S) when is_list(Fmt), is_list(Args) ->
+    fail(Reason, save_prints({Fmt,Args}, S)).
+
 fail(Reason, S) ->
     throw({fail, Reason, S}).
 
@@ -312,38 +318,51 @@ send(S=#s{ssh=C}, hello) ->
     send(S, list_to_binary(Hello));
 
 send(S0, ssh_msg_kexinit) ->
-    {Msg, Bytes, C0} = ssh_transport:key_exchange_init_msg(S0#s.ssh),
-    S1 = opt(print_messages, S0, 
-	     fun(X) when X==true;X==detail -> {"Send~n~s~n",[format_msg(Msg)]} end),
-    S = case ?role(S1) of
-	    server when is_record(S1#s.peer_kexinit, ssh_msg_kexinit) ->
-		{ok, C} = 
-		    ssh_transport:handle_kexinit_msg(S1#s.peer_kexinit, Msg, C0),
-		S1#s{peer_kexinit = used,
-		     own_kexinit = used,
-		     ssh = C};
-	    _ ->
-		S1#s{ssh = C0,
-		     own_kexinit = Msg}
-	end,
-    send_bytes(Bytes, S#s{return_value = Msg});
+    {Msg, _Bytes, _C0} = ssh_transport:key_exchange_init_msg(S0#s.ssh),
+    send(S0, Msg);
 
-send(S0, ssh_msg_kexdh_init) when ?role(S0) == client,
-				  is_record(S0#s.peer_kexinit, ssh_msg_kexinit),
-				  is_record(S0#s.own_kexinit, ssh_msg_kexinit) ->
+send(S0=#s{alg_neg={undefined,PeerMsg}}, Msg=#ssh_msg_kexinit{}) ->
+    S1 = opt(print_messages, S0,
+	     fun(X) when X==true;X==detail -> {"Send~n~s~n",[format_msg(Msg)]} end),
+    S2 = case PeerMsg of
+	     #ssh_msg_kexinit{} ->
+		 try ssh_transport:handle_kexinit_msg(PeerMsg, Msg, S1#s.ssh) of
+		     {ok,Cx} when ?role(S1) == server ->
+			 S1#s{alg = Cx#ssh.algorithms};
+		     {ok,_NextKexMsgBin,Cx} when ?role(S1) == client ->
+			 S1#s{alg = Cx#ssh.algorithms}
+		 catch
+		     Class:Exc ->
+			 save_prints({"Algoritm negotiation failed at line ~p:~p~n~p:~s~nPeer: ~s~n Own: ~s~n",
+				      [?MODULE,?LINE,Class,format_msg(Exc),format_msg(PeerMsg),format_msg(Msg)]},
+				     S1)
+		 end;
+	     undefined ->
+		 S1
+	 end,
+    {Bytes, C} = ssh_transport:ssh_packet(Msg, S2#s.ssh),
+    send_bytes(Bytes, S2#s{return_value = Msg,
+			  alg_neg = {Msg,PeerMsg},
+			  ssh = C});
+
+send(S0, ssh_msg_kexdh_init) when ?role(S0) == client ->
+    {OwnMsg, PeerMsg} = S0#s.alg_neg,
     {ok, NextKexMsgBin, C} = 
-	ssh_transport:handle_kexinit_msg(S0#s.peer_kexinit, S0#s.own_kexinit, S0#s.ssh),
-
+	try ssh_transport:handle_kexinit_msg(PeerMsg, OwnMsg, S0#s.ssh)
+	catch
+	    Class:Exc ->
+		fail("Algoritm negotiation failed!",
+		     {"Algoritm negotiation failed at line ~p:~p~n~p:~s~nPeer: ~s~n Own: ~s",
+		      [?MODULE,?LINE,Class,format_msg(Exc),format_msg(PeerMsg),format_msg(OwnMsg)]},
+		     S0)
+	end,
     S = opt(print_messages, S0,
 	    fun(X) when X==true;X==detail -> 
 		    #ssh{keyex_key = {{_Private, Public}, {_G, _P}}} = C,
 		    Msg = #ssh_msg_kexdh_init{e = Public},
 		    {"Send (reconstructed)~n~s~n",[format_msg(Msg)]}
 	    end),
-
-    send_bytes(NextKexMsgBin, S#s{ssh = C,
-				  peer_kexinit = used,
-				  own_kexinit = used});
+    send_bytes(NextKexMsgBin, S#s{ssh = C});
 
 send(S0, ssh_msg_kexdh_reply) ->
     Bytes = proplists:get_value(ssh_msg_kexdh_reply, S0#s.reply),
@@ -389,26 +408,42 @@ recv(S0 = #s{}) ->
 	true ->
 	    %% Has seen hello, therefore no more crlf-messages are alowed.
 	    S = receive_binary_msg(S1),
-	    case M=S#s.return_value of
-		#ssh_msg_kexinit{} when ?role(S) == server,
-					S#s.own_kexinit =/= undefined ->
-		    {ok, C} = 
-			ssh_transport:handle_kexinit_msg(M, S#s.own_kexinit, S#s.ssh),
-		    S#s{peer_kexinit = used,
-			own_kexinit = used,
-			ssh = C};
-		#ssh_msg_kexinit{} -> 
-		    S#s{peer_kexinit = M};
+	    case PeerMsg = S#s.return_value of
+		#ssh_msg_kexinit{} ->
+		    case S#s.alg_neg of
+			{undefined,undefined} ->
+			    S#s{alg_neg = {undefined,PeerMsg}};
+
+			{undefined,_} ->
+			    fail("2 kexint received!!", S);
+					
+			{OwnMsg, _} ->
+			    try ssh_transport:handle_kexinit_msg(PeerMsg, OwnMsg, S#s.ssh) of
+				{ok,C} when ?role(S) == server ->
+				    S#s{alg_neg = {OwnMsg, PeerMsg},
+					alg = C#ssh.algorithms,
+					ssh = C};
+				{ok,_NextKexMsgBin,C} when ?role(S) == client ->
+				    S#s{alg_neg = {OwnMsg, PeerMsg},
+					alg = C#ssh.algorithms}
+			    catch
+				Class:Exc ->
+				    save_prints({"Algoritm negotiation failed at line ~p:~p~n~p:~s~nPeer: ~s~n Own: ~s~n",
+						 [?MODULE,?LINE,Class,format_msg(Exc),format_msg(PeerMsg),format_msg(OwnMsg)]},
+						S#s{alg_neg = {OwnMsg, PeerMsg}})
+			    end
+		    end;
+
 		#ssh_msg_kexdh_init{} -> % Always the server
-		    {ok, Reply, C} = ssh_transport:handle_kexdh_init(M, S#s.ssh),
+		    {ok, Reply, C} = ssh_transport:handle_kexdh_init(PeerMsg, S#s.ssh),
 		    S#s{ssh = C,
 			reply = [{ssh_msg_kexdh_reply,Reply} | S#s.reply]
 		       };
 		#ssh_msg_kexdh_reply{} ->
-		    {ok, _NewKeys, C} = ssh_transport:handle_kexdh_reply(M, S#s.ssh),
+		    {ok, _NewKeys, C} = ssh_transport:handle_kexdh_reply(PeerMsg, S#s.ssh),
 		    S#s{ssh=C#ssh{send_sequence=S#s.ssh#ssh.send_sequence}}; % Back the number
 		#ssh_msg_newkeys{} ->
-		    {ok, C} = ssh_transport:handle_new_keys(M, S#s.ssh),
+		    {ok, C} = ssh_transport:handle_new_keys(PeerMsg, S#s.ssh),
 		    S#s{ssh=C};
 		_ ->
 		    S
@@ -682,10 +717,18 @@ seqnum_trace(S) ->
 
 print_traces(S) when S#s.prints == [] -> S;
 print_traces(S) ->
+    Len = length(S#s.prints),
     ct:log("~s",
-	   [lists:foldl(fun({Fmt,Args}, Acc) ->
-				[io_lib:format(Fmt,Args) | Acc]
-			end, "", S#s.prints)]
+	   [lists:foldl(
+	      fun({Fmt,Args}, Acc) ->
+		      [case Len-length(Acc)-1 of
+			   0 ->
+			       io_lib:format(Fmt,Args);
+			   N ->
+			       io_lib:format(lists:concat(['~p --------~n',Fmt]),
+					     [Len-length(Acc)-1|Args])
+		       end | Acc]
+	      end, "", S#s.prints)]
 	  ).
 
 opt(Flag, S, Fun) when is_function(Fun,1) ->
diff --git a/lib/ssh/test/ssh_upgrade_SUITE.erl b/lib/ssh/test/ssh_upgrade_SUITE.erl
index c0645f3b01..85f4d36258 100644
--- a/lib/ssh/test/ssh_upgrade_SUITE.erl
+++ b/lib/ssh/test/ssh_upgrade_SUITE.erl
@@ -94,8 +94,8 @@ minor_upgrade(Config) when is_list(Config) ->
 %%% Called by ct_release_test:upgrade/4
 upgrade_init(CTData, State) -> 
     {ok, AppUp={_, _, Up, _Down}} = ct_release_test:get_appup(CTData, ssh),
-    ct:pal("AppUp: ~p", [AppUp]),
-    ct:pal("Up: ~p", [Up]),
+    ct:log("AppUp: ~p", [AppUp]),
+    ct:log("Up: ~p", [Up]),
     case Soft = is_soft(Up) of
 	%% It is symmetrical, if upgrade is soft so is downgrade  
 	true ->
@@ -134,12 +134,12 @@ is_soft(_) ->
 
 
 test_hard(State0, FileName) ->
-    ct:pal("test_hard State0=~p, FileName=~p",[State0, FileName]),
+    ct:log("test_hard State0=~p, FileName=~p",[State0, FileName]),
     State = setup_server_client(State0),
     test_connection(FileName, random_contents(), State).
 
 test_soft(State0, FileName) ->
-    ct:pal("test_soft State0=~p, FileName=~p",[State0, FileName]),
+    ct:log("test_soft State0=~p, FileName=~p",[State0, FileName]),
     State = test_connection(FileName, random_contents(), State0),
     setup_server_client( close(State) ).
 
@@ -171,7 +171,7 @@ setup_server_client(#state{config=Config} = State) ->
 test_connection(FileName, FileContents,
 		#state{client = ChannelPid,
 		       root_dir = FtpRootDir} = State) ->
-    ct:pal("test_connection Writing with ssh_sftp:write_file",[]),
+    ct:log("test_connection Writing with ssh_sftp:write_file",[]),
     case ssh_sftp:write_file(ChannelPid, FileName, FileContents) of
 	ok ->
 	    case ssh_sftp:read_file(ChannelPid, FileName) of