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_transport.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_transport.erl')
| -rw-r--r-- | lib/ssh/src/ssh_transport.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl index c5b0704925..7424c9bcaf 100644 --- a/lib/ssh/src/ssh_transport.erl +++ b/lib/ssh/src/ssh_transport.erl @@ -759,8 +759,7 @@ ext_info_message(#ssh{role=server, send_ext_info=true, opts = Opts} = Ssh0) -> AlgsList = lists:map(fun erlang:atom_to_list/1, - proplists:get_value(public_key, - ?GET_OPT(preferred_algorithms, Opts))), + ?GET_OPT(pref_public_key_algs, Opts)), Msg = #ssh_msg_ext_info{nr_extensions = 1, data = [{"server-sig-algs", string:join(AlgsList,",")}] }, |