aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh_options.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-11-07 15:02:22 +0100
committerHans Nilsson <[email protected]>2018-11-08 10:39:00 +0100
commita53a4d0bae3e39877f3edf4c0f33a350b34a8137 (patch)
treed50b865e514551901a9b26c9fc8ff916514bd76d /lib/ssh/src/ssh_options.erl
parent434090c14c0d1692c3eaeebb97c9b86c3dff01a5 (diff)
downloadotp-a53a4d0bae3e39877f3edf4c0f33a350b34a8137.tar.gz
otp-a53a4d0bae3e39877f3edf4c0f33a350b34a8137.tar.bz2
otp-a53a4d0bae3e39877f3edf4c0f33a350b34a8137.zip
ssh: Fix ssh_options checking for ext_info
A bug for SSH_MSG_EXT_INFO was fixed both for client and server. Before that fix, wrong option was read for the information sent to the peer. This commit adapts the option checking so that the correct option now used is available not only for servers but also for clients.
Diffstat (limited to 'lib/ssh/src/ssh_options.erl')
-rw-r--r--lib/ssh/src/ssh_options.erl12
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,