PuTTy: Diff

Differences From Artifact [2be3827d5b]:

File ssh.c — part of check-in [f83300ea9e] at 2004-08-14 07:24:02 on branch trunk — ssh_free() should not call log_free(); it's for the front end to decide whether the logctx is finished with or not. (user: simon size: 202417)

To Artifact [bd9ce42f76]:

File ssh.c — part of check-in [4614439a8b] at 2004-08-17 09:08:05 on branch trunk — Someone complained that their keyboard-interactive password prompt was being truncated - it was from OpenSSH on HP/UX and had all sorts of stuff in it ("last successful login" etc). Bodged it by bumping up the space allocated in the fixed array for a password prompt. Also added an indication that the prompt is being truncated, as required by draft-ietf-secsh-auth-kbdinteract-06. (NB that before this checkin, there was a more-or-less harmless buffer overread where if we ever received a keyboard-interactive prompt with echo=1, we'd probably spew goo on the terminal; fixed now.) (user: jacob size: 202606)

︙			︙
4606 4607 4608 4609 4610 4611 4612 ~~4613~~ 4614 4615 4616 4617 4618 4619 4620	int gotit, need_pw, can_pubkey, can_passwd, can_keyb_inter; int tried_pubkey_config, tried_agent, tried_keyb_inter; int kbd_inter_running; int we_are_in; int num_prompts, curr_prompt, echo; char username[100]; int got_username; ~~char pwprompt[~~200~~];~~ char password[100]; void publickey_blob; int publickey_bloblen; unsigned char request[5], response, *p; int responselen; int keyi, nkeys; int authed;	\|	4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620	int gotit, need_pw, can_pubkey, can_passwd, can_keyb_inter; int tried_pubkey_config, tried_agent, tried_keyb_inter; int kbd_inter_running; int we_are_in; int num_prompts, curr_prompt, echo; char username[100]; int got_username; char pwprompt[512]; char password[100]; void publickey_blob; int publickey_bloblen; unsigned char request[5], response, *p; int responselen; int keyi, nkeys; int authed;
︙			︙
5185 5186 5187 5188 5189 5190 5191 ~~5192~~ ~~5193 5194~~ 5195 5196 5197 5198 5199 5200 5201	/ if (s->curr_prompt < s->num_prompts) { char prompt; int prompt_len; ssh_pkt_getstring(ssh, &prompt, &prompt_len); if (prompt_len > 0) { ~~~~strn~~cpy(s->pwprompt, prompt, ~~sizeof(s->pwprompt)~~);~~ ~~s->pwprompt[prompt_len < ~~sizeof(s->pwprompt) ?~~ ~~prompt_len : sizeof(s->pwprompt)-1] = '\0';~~~~ } else { strcpy(s->pwprompt, "<server failed to send prompt>: "); } s->echo = ssh2_pkt_getbool(ssh); s->need_pw = TRUE; } else	> > > > \| > > > \| < >	5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 5200 5201 5202 5203 5204 5205 5206 5207 5208	/ if (s->curr_prompt < s->num_prompts) { char prompt; int prompt_len; ssh_pkt_getstring(ssh, &prompt, &prompt_len); if (prompt_len > 0) { static const char trunc[] = "<prompt truncated>: "; static const int prlen = sizeof(s->pwprompt) - lenof(trunc); if (prompt_len > prlen) { memcpy(s->pwprompt, prompt, prlen); strcpy(s->pwprompt + prlen, trunc); } else { memcpy(s->pwprompt, prompt, prompt_len); s->pwprompt[prompt_len] = '\0'; } } else { strcpy(s->pwprompt, "<server failed to send prompt>: "); } s->echo = ssh2_pkt_getbool(ssh); s->need_pw = TRUE; } else
︙			︙