diff options
| author | Erlang/OTP <[email protected]> | 2016-01-08 13:09:29 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-01-08 13:09:29 +0100 |
| commit | 99f3ef4df2fe90bc67afe9dc87464be18457dfec (patch) | |
| tree | 4412e809e7fe68c215460a84ecc3f3c025f29b94 /lib/ssh/src/ssh_connection_handler.erl | |
| parent | 21d6192389a04024f7a41ced9d0911a9cce6f4e8 (diff) | |
| parent | 9394c572a28d08f3c564d6f388152c9c41968565 (diff) | |
| download | otp-99f3ef4df2fe90bc67afe9dc87464be18457dfec.tar.gz otp-99f3ef4df2fe90bc67afe9dc87464be18457dfec.tar.bz2 otp-99f3ef4df2fe90bc67afe9dc87464be18457dfec.zip | |
Merge branch 'hans/ssh/keyboard_interactive0/OTP-13255' into maint-18
* hans/ssh/keyboard_interactive0/OTP-13255:
ssh: update vsn.mk to 4.2.1
ssh: handle secondary ssh_msg_userauth_info_request message
ssh: testcase for abnormal keyboard-interactive authentication
Diffstat (limited to 'lib/ssh/src/ssh_connection_handler.erl')
| -rw-r--r-- | lib/ssh/src/ssh_connection_handler.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl index f082db136c..ce1931e4f4 100644 --- a/lib/ssh/src/ssh_connection_handler.erl +++ b/lib/ssh/src/ssh_connection_handler.erl @@ -648,10 +648,12 @@ userauth_keyboard_interactive(Msg = #ssh_msg_userauth_failure{}, userauth_keyboard_interactive_info_response(Msg=#ssh_msg_userauth_failure{}, #state{ssh_params = #ssh{role = client}} = State) -> userauth(Msg, State); - userauth_keyboard_interactive_info_response(Msg=#ssh_msg_userauth_success{}, #state{ssh_params = #ssh{role = client}} = State) -> - userauth(Msg, State). + userauth(Msg, State); +userauth_keyboard_interactive_info_response(Msg=#ssh_msg_userauth_info_request{}, + #state{ssh_params = #ssh{role = client}} = State) -> + userauth_keyboard_interactive(Msg, State). %%-------------------------------------------------------------------- -spec connected({#ssh_msg_kexinit{}, binary()}, %%| %% #ssh_msg_kexdh_init{}, |