diff options
| author | Hans Nilsson <[email protected]> | 2015-10-08 16:04:30 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-10-08 16:04:30 +0200 |
| commit | 309c4b503df1a586e57f6558b6de08245fa80d47 (patch) | |
| tree | 1b0c32b3b98c8278c375a30dd9e3a226f2942cbb /lib/ssh/src | |
| parent | 0bc373ca42a1e880a97e34f664ab968144c2a4f4 (diff) | |
| parent | ca0aef835dba5ef2c4185289092ed0fc2f1bb2ba (diff) | |
| download | otp-309c4b503df1a586e57f6558b6de08245fa80d47.tar.gz otp-309c4b503df1a586e57f6558b6de08245fa80d47.tar.bz2 otp-309c4b503df1a586e57f6558b6de08245fa80d47.zip | |
Merge branch 'hans/ssh/option_dh_gex_limits_ignored/OTP-13029' into maint
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh_transport.erl | 13 |
1 files changed, 7 insertions, 6 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 |