nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix mishandling of user abort during SSH-1 auth.

Browse Source 
If the user presses ^C or ^D at an authentication prompt, I meant to
handle that by calling ssh_user_close, i.e. treat the closure as being
intentionally directed _by_ the user, and hence don't bother putting
up a warning box telling the user it had happened.

I got this right in ssh2userauth, but in ssh1login I mistakenly called
ssh_sw_abort instead. That's what I get for going through all the
subtly different session closures in a hurry trying to decide which of
five categories each one falls into...
This commit is contained in:
Simon Tatham 2018-09-25 08:58:46 +01:00
parent cb6fa5fff6
commit f22d442003
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssh1login.c
View File

@ -712,7 +712,8 @@ static void ssh1_login_process_queue(PacketProtocolLayer *ppl)
}
if (!s->userpass_ret) {
/* Failed to get a passphrase. Terminate. */
ssh_sw_abort(s->ppl.ssh, "Unable to authenticate");
ssh_user_close(s->ppl.ssh,
"User aborted at passphrase prompt");
return;
}
passphrase = dupstr(s->cur_prompt->prompts[0]->result);
@ -968,7 +969,7 @@ static void ssh1_login_process_queue(PacketProtocolLayer *ppl)
* because one was supplied on the command line
* which has already failed to work). Terminate.
*/
ssh_sw_abort(s->ppl.ssh, "Unable to authenticate");
ssh_user_close(s->ppl.ssh, "User aborted at password prompt");
return;
}