diff options
| author | Hans Nilsson <[email protected]> | 2015-08-31 09:51:51 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-08-31 09:51:51 +0200 |
| commit | 46332e63065f0b76e0373f77b862590760b23f85 (patch) | |
| tree | 5a9b28da4a19e91b72ab1beb3caf3745252c3ede /lib/ssh/src/ssh_transport.erl | |
| parent | ee71e0e20819e2ab9e251f4bb46e8b0b19f2a1b3 (diff) | |
| parent | 95de23a194ccb1603132d3a3baafa66385320559 (diff) | |
| download | otp-46332e63065f0b76e0373f77b862590760b23f85.tar.gz otp-46332e63065f0b76e0373f77b862590760b23f85.tar.bz2 otp-46332e63065f0b76e0373f77b862590760b23f85.zip | |
Merge branch 'hans/ssh/more_dh_group/OTP-12937' into maint
* hans/ssh/more_dh_group/OTP-12937:
ssh: dh_gex defautl values increased. Groups added
Diffstat (limited to 'lib/ssh/src/ssh_transport.erl')
| -rw-r--r-- | lib/ssh/src/ssh_transport.erl | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl index 1914b223bc..2b6f0a3cdc 100644 --- a/lib/ssh/src/ssh_transport.erl +++ b/lib/ssh/src/ssh_transport.erl @@ -1340,14 +1340,10 @@ peer_name({Host, _}) -> %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -dh_group('diffie-hellman-group1-sha1') -> ?dh_group1; -dh_group('diffie-hellman-group14-sha1') -> ?dh_group14. - -dh_gex_default_groups() -> - [{1024, ?dh_group1 }, - {2048, ?dh_group14}, - {3072, ?dh_group15}, - {4096, ?dh_group16}]. +dh_group('diffie-hellman-group1-sha1') -> element(2, ?dh_group1); +dh_group('diffie-hellman-group14-sha1') -> element(2, ?dh_group14). + +dh_gex_default_groups() -> ?dh_default_groups. dh_gex_group(Min, N, Max, undefined) -> |