ssh: Algorithms test case added

2 files changed, 65 insertions, 9 deletions

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 3e7726c24d..cf58806aa8 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -215,13 +215,14 @@
   {compression,[none,zlib]}
 }
 </code>
-        <p>Note that we want different algorithms in the two directions for <c>cipher</c>, but the same in
-	both directions for <c>mac</c> and <c>compression</c>.  We keep the default for <c>kex</c> and 
-	<c>public_key</c> but has given the default value explicitly for <c>public_key</c></p>
+        <p>The example specifies different algorithms in the two directions (client2server and server2client), for cipher but specifies the same
+algorithms for mac and compression in both directions. The kex (key exchange) and public key algorithms are set to their default values,
+kex is implicit but public_key is set explicitly.</p>
+
         <warning>
 	  <p>Changing the values can make a connection less secure. Do not change unless you
 	  know exactly what you are doing. If you do not understand the values then you
-	  are not supposed to change them</p>
+	  are not supposed to change them.</p>
 	</warning>
 	  </item>
 
@@ -409,13 +410,14 @@
   {compression,[none,zlib]}
 }
 </code>
-        <p>Note that we want different algorithms in the two directions for <c>cipher</c>, but the same in
-	both directions for <c>mac</c> and <c>compression</c>.  We keep the default for <c>kex</c> and 
-	<c>public_key</c> but has given the default value explicitly for <c>public_key</c></p>
+        <p>The example specifies different algorithms in the two directions (client2server and server2client), for cipher but specifies the same
+algorithms for mac and compression in both directions. The kex (key exchange) and public key algorithms are set to their default values,
+kex is implicit but public_key is set explicitly.</p>
+
         <warning>
 	  <p>Changing the values can make a connection less secure. Do not change unless you
 	  know exactly what you are doing. If you do not understand the values then you
-	  are not supposed to change them</p>
+	  are not supposed to change them.</p>
 	</warning>
 	  </item>
 
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index e9002b8bfe..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,
@@ -1065,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),
@@ -1234,12 +1286,14 @@ 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},
-					  {preferred_algorithms,[{compression, ['[email protected]']}]}
+					  {preferred_algorithms,[{compression, ['[email protected]',
+										none]}]}
 					 ]),
     ok = ssh:close(ConnectionRef),
     ssh:stop_daemon(Pid).