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_connection_handler.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_connection_handler.erl')
| -rw-r--r-- | lib/ssh/src/ssh_connection_handler.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl index 4b41c10cbb..30eafc2f2a 100644 --- a/lib/ssh/src/ssh_connection_handler.erl +++ b/lib/ssh/src/ssh_connection_handler.erl @@ -983,6 +983,10 @@ handle_event(_, #ssh_msg_userauth_info_request{}, {userauth_keyboard_interactive %%% ######## {connected, client|server} #### +%% Skip ext_info messages in connected state (for example from OpenSSH >= 7.7) +handle_event(_, #ssh_msg_ext_info{}, {connected,_Role}, D) -> + {keep_state, D}; + handle_event(_, {#ssh_msg_kexinit{},_}, {connected,Role}, D0) -> {KeyInitMsg, SshPacket, Ssh} = ssh_transport:key_exchange_init_msg(D0#data.ssh_params), D = D0#data{ssh_params = Ssh, |