diff options
| author | Hans Nilsson <[email protected]> | 2018-11-09 16:02:25 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-11-09 16:02:25 +0100 |
| commit | 7cba65ba915c494ae177a64a800434355ab74c00 (patch) | |
| tree | 94c403d79058578f5e3d7624c9ee12ede13f8508 /lib/ssh/src/ssh_transport.erl | |
| parent | 85591a55983966ff2f25805abc8d61c8b4c05944 (diff) | |
| parent | a53a4d0bae3e39877f3edf4c0f33a350b34a8137 (diff) | |
| download | otp-7cba65ba915c494ae177a64a800434355ab74c00.tar.gz otp-7cba65ba915c494ae177a64a800434355ab74c00.tar.bz2 otp-7cba65ba915c494ae177a64a800434355ab74c00.zip | |
Merge branch 'hans/ssh/fix_ext_info/OTP-15413' into maint
* hans/ssh/fix_ext_info/OTP-15413:
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,",")}] }, |