diff options
author | Hans Nilsson <[email protected]> | 2018-11-09 16:06:34 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2018-11-09 16:06:34 +0100 |
commit | 3e5ede0422988053f9a59cbb2f003556008a26b9 (patch) | |
tree | 971da7afb060ccb75f06a03da1556653be59424f /lib/ssh/src/ssh_options.erl | |
parent | 19a2f17f67a221640534d6cc4c85cead8d3f5ed1 (diff) | |
parent | 43c7738490e3bd07fa5932b6ddc6899209323bac (diff) | |
download | otp-3e5ede0422988053f9a59cbb2f003556008a26b9.tar.gz otp-3e5ede0422988053f9a59cbb2f003556008a26b9.tar.bz2 otp-3e5ede0422988053f9a59cbb2f003556008a26b9.zip |
Merge branch 'maint'
* maint:
ssh: Clear remote user_dir in ssh_compat_SUITE
ssh: Check compatibility with new OpenSSH versions
ssh: Fix documentation for public key in ext_info
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 bc9f2156bc..bc9b0b6eda 100644 --- a/lib/ssh/src/ssh_options.erl +++ b/lib/ssh/src/ssh_options.erl @@ -452,12 +452,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}) -> @@ -523,6 +517,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, |