Merge branch 'hans/ssh/configurable_cipher/OTP-12029'

* hans/ssh/configurable_cipher/OTP-12029:
  ssh: Algorithms test case added
  ssh: Undocumented option 'compression' replaced by 'preferred_algorithms'
  ssh: New option 'preferred_algorithms'
  ssh: Remove erroneous option 'role'

7 files changed, 71 insertions, 4 deletions

diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index aaf0fa9905..cff695681e 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -56,6 +56,7 @@ all() ->
      ssh_daemon_minimal_remote_max_packet_size_option,
      ssh_msg_debug_fun_option_client,
      ssh_msg_debug_fun_option_server,
+     preferred_algorithms,
      id_string_no_opt_client,
      id_string_own_string_client,
      id_string_random_client,
@@ -92,6 +93,7 @@ basic_tests() ->
 
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
+    catch crypto:stop(),
     case catch crypto:start() of
 	ok ->
 	    Config;
@@ -289,7 +291,7 @@ exec_compressed(Config) when is_list(Config) ->
     UserDir = ?config(priv_dir, Config), 
 
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},{user_dir, UserDir},
-					     {compression, zlib},
+					     {preferred_algorithms,[{compression, [zlib]}]},
 					     {failfun, fun ssh_test_lib:failfun/2}]),
     
     ConnectionRef =
@@ -1064,6 +1066,57 @@ ssh_daemon_minimal_remote_max_packet_size_option(Config) ->
     ssh:stop_daemon(Server).
     
 %%--------------------------------------------------------------------
+%% This test try every algorithm by connecting to an Erlang server
+preferred_algorithms(Config) ->
+    SystemDir = ?config(data_dir, 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),
+
+    {Server, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
+						{user_dir, UserDir},
+						{user_passwords, [{"vego", "morot"}]},
+						{failfun, fun ssh_test_lib:failfun/2}]),
+    Available = ssh:default_algorithms(),
+    Tests = [[{Tag,[Alg]}] || {Tag, SubAlgs} <- Available,
+			  is_atom(hd(SubAlgs)),
+			  Alg <- SubAlgs]
+	++  [[{Tag,[{T1,[A1]},{T2,[A2]}]}] || {Tag, [{T1,As1},{T2,As2}]} <- Available,
+					      A1 <- As1,
+					      A2 <- As2],
+    ct:log("TESTS: ~p",[Tests]),
+    [connect_exec_channel(Host,Port,PrefAlgs)  || PrefAlgs <- Tests],
+    ssh:stop_daemon(Server).
+
+
+connect_exec_channel(_Host, Port, Algs) ->
+    ct:log("Try ~p",[Algs]),
+    ConnectionRef = ssh_test_lib:connect(Port, [{silently_accept_hosts, true},
+						{user_interaction, false},
+						{user, "vego"},
+						{password, "morot"},
+						{preferred_algorithms,Algs}
+					       ]),
+    chan_exec(ConnectionRef, "2*21.", <<"42\n">>),
+    ssh:close(ConnectionRef).
+
+chan_exec(ConnectionRef, Cmnd, Expected) ->
+    {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
+    success = ssh_connection:exec(ConnectionRef, ChannelId0,Cmnd, infinity),
+    Data0 = {ssh_cm, ConnectionRef, {data, ChannelId0, 0, Expected}},
+    case ssh_test_lib:receive_exec_result(Data0) of
+	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]),
+	    ssh_test_lib:receive_exec_result(Data0,
+					     ConnectionRef, ChannelId0);
+	Other0 ->
+	    ct:fail(Other0)
+    end.
+
+%%--------------------------------------------------------------------
 id_string_no_opt_client(Config) ->
     {Server, _Host, Port} = fake_daemon(Config),
     {error,_} = ssh:connect("localhost", Port, [], 1000),
@@ -1233,12 +1286,15 @@ openssh_zlib_basic_test(Config) ->
 
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
 					     {user_dir, UserDir},
+					     {preferred_algorithms,[{compression, ['[email protected]']}]},
 					     {failfun, fun ssh_test_lib:failfun/2}]),
     ConnectionRef =
 	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
 					  {user_dir, UserDir},
 					  {user_interaction, false},
-					  {compression, openssh_zlib}]),
+					  {preferred_algorithms,[{compression, ['[email protected]',
+										none]}]}
+					 ]),
     ok = ssh:close(ConnectionRef),
     ssh:stop_daemon(Pid).
 
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index db51f65509..f0c337cf2f 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -65,6 +65,7 @@ ptty() ->
 
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
+    catch crypto:stop(),
     case catch crypto:start() of
 	ok ->
 	    Config;
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl
index cb74a27638..850b1cbf6b 100644
--- a/lib/ssh/test/ssh_sftp_SUITE.erl
+++ b/lib/ssh/test/ssh_sftp_SUITE.erl
@@ -49,6 +49,7 @@ all() ->
 
 
 init_per_suite(Config) ->
+    catch crypto:stop(),
     case (catch crypto:start()) of
 	ok ->
 	    ssh:start(),
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl
index 0ce8eec906..925b02a437 100644
--- a/lib/ssh/test/ssh_sftpd_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_SUITE.erl
@@ -68,6 +68,7 @@ groups() ->
 %%--------------------------------------------------------------------
 
 init_per_suite(Config) ->
+    catch crypto:stop(),
     case (catch crypto:start()) of
 	ok ->
 	    DataDir = ?config(data_dir, Config),	    
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
index cc34cc0793..eac7575486 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
@@ -52,6 +52,7 @@ groups() ->
 
 init_per_suite(Config) ->
     catch ssh:stop(),
+    catch crypto:stop(),
     case catch crypto:start() of
 	ok ->
 	    DataDir = ?config(data_dir, Config),
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index a61fd2dd41..277e3a1b08 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -60,6 +60,7 @@ groups() ->
     ].
 
 init_per_suite(Config) ->
+    catch crypto:stop(),
     case catch crypto:start() of
 	ok ->
 	    case gen_tcp:connect("localhost", 22, []) of
@@ -166,9 +167,11 @@ erlang_client_openssh_server_exec_compressed() ->
     [{doc, "Test that compression option works"}].
 
 erlang_client_openssh_server_exec_compressed(Config) when is_list(Config) ->
+    CompressAlgs = [zlib, '[email protected]',none],
     ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
 							     {user_interaction, false},
-							     {compression, zlib}]),
+							     {preferred_algorithms,
+							      [{compression,CompressAlgs}]}]),
     {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
     success = ssh_connection:exec(ConnectionRef, ChannelId,
 				  "echo testing", infinity),
@@ -326,8 +329,11 @@ erlang_server_openssh_client_exec_compressed(Config) when is_list(Config) ->
     PrivDir = ?config(priv_dir, Config),
     KnownHosts = filename:join(PrivDir, "known_hosts"),
 
+%%    CompressAlgs = [zlib, '[email protected]'], % Does not work
+    CompressAlgs = [zlib],
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
-					     {compression, zlib},
+					     {preferred_algorithms,
+					      [{compression, CompressAlgs}]},
 					     {failfun, fun ssh_test_lib:failfun/2}]),
 
     ct:sleep(500),
diff --git a/lib/ssh/test/ssh_unicode_SUITE.erl b/lib/ssh/test/ssh_unicode_SUITE.erl
index cc916673b3..07d51335c6 100644
--- a/lib/ssh/test/ssh_unicode_SUITE.erl
+++ b/lib/ssh/test/ssh_unicode_SUITE.erl
@@ -55,6 +55,7 @@ all() ->
 
 
 init_per_suite(Config) ->
+    catch crypto:stop(),
     case {file:native_name_encoding(), (catch crypto:start())} of
 	{utf8, ok} ->
 	    ssh:start(),