diff options
| author | Hans Nilsson <[email protected]> | 2015-08-31 09:52:19 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-08-31 09:52:19 +0200 |
| commit | fa859b04e560744a5982fce0bdce1e1d71b1a81f (patch) | |
| tree | e0db7b714ab50556d5f586586e50fd68b8508a64 /lib/ssh/src/ssh_transport.erl | |
| parent | bd698a302da6f4ca0940add26852c32dc27d3d07 (diff) | |
| parent | 46332e63065f0b76e0373f77b862590760b23f85 (diff) | |
| download | otp-fa859b04e560744a5982fce0bdce1e1d71b1a81f.tar.gz otp-fa859b04e560744a5982fce0bdce1e1d71b1a81f.tar.bz2 otp-fa859b04e560744a5982fce0bdce1e1d71b1a81f.zip | |
Merge branch 'maint'
* maint:
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) -> |