diff options
author | Erlang/OTP <[email protected]> | 2018-11-14 10:03:44 +0100 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2018-11-14 10:03:44 +0100 |
commit | 23ea9ba0451753b317117bd3f3148b1dbfbbdcb6 (patch) | |
tree | a00bb2c91eaaafc9163a5551cbb7782dbce3a888 /lib/ssh/src/ssh_options.erl | |
parent | 39676016001f61affa62f040f42c704a62fa542c (diff) | |
parent | a53a4d0bae3e39877f3edf4c0f33a350b34a8137 (diff) | |
download | otp-23ea9ba0451753b317117bd3f3148b1dbfbbdcb6.tar.gz otp-23ea9ba0451753b317117bd3f3148b1dbfbbdcb6.tar.bz2 otp-23ea9ba0451753b317117bd3f3148b1dbfbbdcb6.zip |
Merge branch 'hans/ssh/fix_ext_info/OTP-15413' into maint-20
* hans/ssh/fix_ext_info/OTP-15413:
ssh: Fix ssh_options checking for ext_info
ssh: Fix SSH_MSG_EXT_INFO bug for OTP SSH as server
ssh: Fix SSH_MSG_EXT_INFO bug for OTP SSH as client
Diffstat (limited to 'lib/ssh/src/ssh_options.erl')
-rw-r--r-- | lib/ssh/src/ssh_options.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ssh/src/ssh_options.erl b/lib/ssh/src/ssh_options.erl index 1e10f72956..3417466c4d 100644 --- a/lib/ssh/src/ssh_options.erl +++ b/lib/ssh/src/ssh_options.erl @@ -445,12 +445,6 @@ default(client) -> class => user_options }, - {pref_public_key_algs, def} => - #{default => ssh_transport:default_algorithms(public_key), - chk => fun check_pref_public_key_algs/1, - class => user_options - }, - {dh_gex_limits, def} => #{default => {1024, 6144, 8192}, % FIXME: Is this true nowadays? chk => fun({Min,I,Max}) -> @@ -516,6 +510,12 @@ default(common) -> class => user_options }, + {pref_public_key_algs, def} => + #{default => ssh_transport:default_algorithms(public_key), + chk => fun check_pref_public_key_algs/1, + class => user_options + }, + {preferred_algorithms, def} => #{default => ssh:default_algorithms(), chk => fun check_preferred_algorithms/1, |