Merge branch 'hans/ssh/option_dh_gex_limits_ignored/OTP-13029' into maint

3 files changed, 40 insertions, 8 deletions

diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index 8030c1dc25..a6438e69d4 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -344,11 +344,12 @@ key_exchange_first_msg(Kex, Ssh0) when Kex == 'diffie-hellman-group1-sha1' ;
     {ok, SshPacket, 
      Ssh1#ssh{keyex_key = {{Private, Public}, {G, P}}}};
 
-key_exchange_first_msg(Kex, Ssh0) when Kex == 'diffie-hellman-group-exchange-sha1' ;
-				       Kex == 'diffie-hellman-group-exchange-sha256' ->
-    Min = ?DEFAULT_DH_GROUP_MIN,
-    NBits = ?DEFAULT_DH_GROUP_NBITS,
-    Max = ?DEFAULT_DH_GROUP_MAX,
+key_exchange_first_msg(Kex, Ssh0=#ssh{opts=Opts}) when Kex == 'diffie-hellman-group-exchange-sha1' ;
+						       Kex == 'diffie-hellman-group-exchange-sha256' ->
+    {Min,NBits,Max} = 
+	proplists:get_value(dh_gex_limits, Opts, {?DEFAULT_DH_GROUP_MIN,
+						  ?DEFAULT_DH_GROUP_NBITS,
+						  ?DEFAULT_DH_GROUP_MAX}),
     {SshPacket, Ssh1} = 
 	ssh_packet(#ssh_msg_kex_dh_gex_request{min = Min, 
 					       n = NBits,
@@ -1417,7 +1418,7 @@ dh_gex_group(Min, N, Max, undefined) ->
     dh_gex_group(Min, N, Max, dh_gex_default_groups());
 dh_gex_group(Min, N, Max, Groups) ->
     %% First try to find an exact match. If not an exact match, select the largest possible.
-    {_,Group} =
+    {_Size,Group} =
 	lists:foldl(
 	  fun(_, {I,G}) when I==N ->
 		  %% If we have an exact match already: use that one
diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index e67fa2469f..1188b324ba 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -162,6 +162,21 @@ simple_exec(Config) ->
     ssh_test_lib:std_simple_exec(Host, Port, Config).
 
 %%--------------------------------------------------------------------
+%% Testing all default groups
+simple_exec_group14(Config) -> simple_exec_group(2048, Config).
+simple_exec_group15(Config) -> simple_exec_group(3072, Config).
+simple_exec_group16(Config) -> simple_exec_group(4096, Config).
+simple_exec_group17(Config) -> simple_exec_group(6144, Config).
+simple_exec_group18(Config) -> simple_exec_group(8192, Config).
+
+simple_exec_group(I, Config) ->
+    Min = I-100,
+    Max = I+100,
+    {Host,Port} = ?config(srvr_addr, Config),
+    ssh_test_lib:std_simple_exec(Host, Port, Config,
+				 [{dh_gex_limits,{Min,I,Max}}]).
+
+%%--------------------------------------------------------------------
 %% Use the ssh client of the OS to connect
 sshc_simple_exec(Config) ->
     PrivDir = ?config(priv_dir, Config),
@@ -254,6 +269,16 @@ specific_test_cases(Tag, Alg, SshcAlgos, SshdAlgos) ->
 		[sshd_simple_exec];
 	    _ ->
 		[]
+	end ++
+	case {Tag,Alg} of
+	    {kex,'diffie-hellman-group-exchange-sha1'} ->
+		[simple_exec_group14,
+		 simple_exec_group15,
+		 simple_exec_group16,
+		 simple_exec_group17,
+		 simple_exec_group18];
+	    _ ->
+		[]
 	end.
 
 supports(Tag, Alg, Algos) ->
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 6fa579d78d..cc3ebf8151 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -93,9 +93,12 @@ std_connect(Config, Host, Port, ExtraOpts) ->
 					  | ExtraOpts]).
 
 std_simple_sftp(Host, Port, Config) ->
+    std_simple_sftp(Host, Port, Config, []).
+
+std_simple_sftp(Host, Port, Config, Opts) ->
     UserDir = ?config(priv_dir, Config),
     DataFile = filename:join(UserDir, "test.data"),
-    ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, []),
+    ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, Opts),
     {ok, ChannelRef} = ssh_sftp:start_channel(ConnectionRef),
     Data = crypto:rand_bytes(proplists:get_value(std_simple_sftp_size,Config,10)),
     ok = ssh_sftp:write_file(ChannelRef, DataFile, Data),
@@ -104,7 +107,10 @@ std_simple_sftp(Host, Port, Config) ->
     Data == ReadData.
 
 std_simple_exec(Host, Port, Config) ->
-    ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, []),
+    std_simple_exec(Host, Port, Config, []).
+
+std_simple_exec(Host, Port, Config, Opts) ->
+    ConnectionRef = ssh_test_lib:std_connect(Config, Host, Port, Opts),
     {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
     success = ssh_connection:exec(ConnectionRef, ChannelId, "23+21-2.", infinity),
     Data = {ssh_cm, ConnectionRef, {data, ChannelId, 0, <<"42\n">>}},