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

Fix to allow more than one challenge/response pair during

Browse Source 
keyboard-interactive authentication. UNTESTED except that I checked
it compiles. Will ask for testing from the user who complained.

[originally from svn r1195]
This commit is contained in:
Simon Tatham 2001-08-22 19:47:05 +00:00
parent 31a6d909bf
commit 96fd4be809
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ssh.c
View File

@ -3323,6 +3323,7 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
} type; } type;
static int gotit, need_pw, can_pubkey, can_passwd, can_keyb_inter; static int gotit, need_pw, can_pubkey, can_passwd, can_keyb_inter;
static int tried_pubkey_config, tried_agent, tried_keyb_inter; static int tried_pubkey_config, tried_agent, tried_keyb_inter;
static int kbd_inter_running;
static int we_are_in; static int we_are_in;
static int num_prompts, echo; static int num_prompts, echo;
static char username[100]; static char username[100];
@ -3457,6 +3458,8 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
tried_pubkey_config = FALSE; tried_pubkey_config = FALSE;
tried_agent = FALSE; tried_agent = FALSE;
tried_keyb_inter = FALSE;
kbd_inter_running = FALSE;
while (1) { while (1) {
/* /*
@ -3488,9 +3491,14 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
break; break;
} }
if (pktin.type != SSH2_MSG_USERAUTH_FAILURE) { if (kbd_inter_running &&
bombout( pktin.type == SSH2_MSG_USERAUTH_INFO_REQUEST) {
("Strange packet received during authentication: type %d", /*
* This is a further prompt in keyboard-interactive
* authentication. Do nothing.
*/
} else if (!pktin.type != SSH2_MSG_USERAUTH_FAILURE) {
bombout(("Strange packet received during authentication: type %d",
pktin.type)); pktin.type));
crReturnV; crReturnV;
} }
@ -3502,10 +3510,11 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
* we can look at the string in it and know what we can * we can look at the string in it and know what we can
* helpfully try next. * helpfully try next.
*/ */
{ if (pktin.type == SSH2_MSG_USERAUTH_FAILURE) {
char *methods; char *methods;
int methlen; int methlen;
ssh2_pkt_getstring(&methods, &methlen); ssh2_pkt_getstring(&methods, &methlen);
kbd_inter_running = FALSE;
if (!ssh2_pkt_getbool()) { if (!ssh2_pkt_getbool()) {
/* /*
* We have received an unequivocal Access * We have received an unequivocal Access
@ -3584,6 +3593,14 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
continue; continue;
} }
kbd_inter_running = TRUE;
}
if (kbd_inter_running) {
method = AUTH_KEYBOARD_INTERACTIVE;
type = AUTH_TYPE_KEYBOARD_INTERACTIVE;
tried_keyb_inter = TRUE;
/* We've got packet with that "interactive" info /* We've got packet with that "interactive" info
dump banners, and set its prompt as ours */ dump banners, and set its prompt as ours */
{ {