diff options
| author | Hans Nilsson <[email protected]> | 2017-05-17 15:20:04 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-05-17 15:20:04 +0200 |
| commit | 37fa1e9a948a1902e2484f7f15d418136284f97f (patch) | |
| tree | 59a76e310daa368820e60f0aca86faf9bd07918c /lib/ssh/src/ssh_transport.erl | |
| parent | 21505aa6ccb27a533d814e83131c2961d47ba8ed (diff) | |
| parent | 4d7ff0a8169141d18335638cf7c6e48d4c18cdf2 (diff) | |
| download | otp-37fa1e9a948a1902e2484f7f15d418136284f97f.tar.gz otp-37fa1e9a948a1902e2484f7f15d418136284f97f.tar.bz2 otp-37fa1e9a948a1902e2484f7f15d418136284f97f.zip | |
Merge branch 'hans/ssh/ext-info_bug_fixes'
Diffstat (limited to 'lib/ssh/src/ssh_transport.erl')
| -rw-r--r-- | lib/ssh/src/ssh_transport.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl index aaec733f3c..1a15798080 100644 --- a/lib/ssh/src/ssh_transport.erl +++ b/lib/ssh/src/ssh_transport.erl @@ -737,9 +737,11 @@ ext_info_message(#ssh{role=client, end; ext_info_message(#ssh{role=server, - send_ext_info=true} = Ssh0) -> + send_ext_info=true, + opts = Opts} = Ssh0) -> AlgsList = lists:map(fun erlang:atom_to_list/1, - ssh_transport:default_algorithms(public_key)), + proplists:get_value(public_key, + ?GET_OPT(preferred_algorithms, Opts))), Msg = #ssh_msg_ext_info{nr_extensions = 1, data = [{"server-sig-algs", string:join(AlgsList,",")}] }, |