diff options
| author | Hans Nilsson <[email protected]> | 2017-04-19 12:01:26 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-04-26 12:15:00 +0200 |
| commit | 519f89016e7ce755775a88730814fa34af21676c (patch) | |
| tree | ce24d8d986534a184986916dfc3d771f0b91404e /lib/ssh/src/ssh_options.erl | |
| parent | b7cba805e37e591d8fa7d7df06f9563a9f926e23 (diff) | |
| download | otp-519f89016e7ce755775a88730814fa34af21676c.tar.gz otp-519f89016e7ce755775a88730814fa34af21676c.tar.bz2 otp-519f89016e7ce755775a88730814fa34af21676c.zip | |
ssh: server-sig-algs, client side
Diffstat (limited to 'lib/ssh/src/ssh_options.erl')
| -rw-r--r-- | lib/ssh/src/ssh_options.erl | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/lib/ssh/src/ssh_options.erl b/lib/ssh/src/ssh_options.erl index 6e898b4fde..0886d5b34d 100644 --- a/lib/ssh/src/ssh_options.erl +++ b/lib/ssh/src/ssh_options.erl @@ -437,9 +437,7 @@ default(client) -> {pref_public_key_algs, def} => #{default => - %% Get dynamically supported keys in the order of the ?SUPPORTED_USER_KEYS - [A || A <- ?SUPPORTED_USER_KEYS, - lists:member(A, ssh_transport:supported_algorithms(public_key))], + ssh_transport:supported_algorithms(public_key), chk => fun check_pref_public_key_algs/1, class => @@ -670,20 +668,8 @@ check_pref_public_key_algs(V) -> PKs = ssh_transport:supported_algorithms(public_key), CHK = fun(A, Ack) -> case lists:member(A, PKs) of - true -> - [A|Ack]; - false -> - %% Check with the documented options, that is, - %% the one we can handle - case lists:member(A,?SUPPORTED_USER_KEYS) of - false -> - %% An algorithm ssh never can handle - error_in_check(A, "Not supported public key"); - true -> - %% An algorithm ssh can handle, but not in - %% this very call - Ack - end + true -> [A|Ack]; + false -> error_in_check(A, "Not supported public key") end end, case lists:foldr( |