aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-12-04 15:42:57 +0100
committerHans Nilsson <[email protected]>2015-12-04 15:42:57 +0100
commit08401d7b2fc7ba8a50ac478ce6b99a8be646f9fb (patch)
tree1259a20df75aee18fe2c427cfebb241ed90793e6 /lib
parent1a6c8b90416e261b0429bbcc253347ce9fbac5ea (diff)
downloadotp-08401d7b2fc7ba8a50ac478ce6b99a8be646f9fb.tar.gz
otp-08401d7b2fc7ba8a50ac478ce6b99a8be646f9fb.tar.bz2
otp-08401d7b2fc7ba8a50ac478ce6b99a8be646f9fb.zip
ssh: ssh_auth checks support for user pubkey alg
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/src/ssh_auth.erl11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_auth.erl b/lib/ssh/src/ssh_auth.erl
index 0d38c563ba..fdbb5c152a 100644
--- a/lib/ssh/src/ssh_auth.erl
+++ b/lib/ssh/src/ssh_auth.erl
@@ -118,7 +118,16 @@ init_userauth_request_msg(#ssh{opts = Opts} = Ssh) ->
service = "ssh-connection",
method = "none",
data = <<>>},
- Algs = proplists:get_value(pref_public_key_algs, Opts, ?SUPPORTED_USER_KEYS),
+ Algs0 = proplists:get_value(pref_public_key_algs, Opts, ?SUPPORTED_USER_KEYS),
+ %% The following line is not strictly correct. The call returns the
+ %% supported HOST key types while we are interested in USER keys. However,
+ %% they "happens" to be the same (for now). This could change....
+ %% There is no danger as long as the set of user keys is a subset of the set
+ %% of host keys.
+ CryptoSupported = ssh_transport:supported_algorithms(public_key),
+ Algs = [A || A <- Algs0,
+ lists:member(A, CryptoSupported)],
+
Prefs = method_preference(Algs),
ssh_transport:ssh_packet(Msg, Ssh#ssh{user = User,
userauth_preference = Prefs,