PuTTy: Diff

Differences From Artifact [66ecb8962a]:

File ssh.c — part of check-in [7756dc109c] at 2011-10-02 06:01:57 on branch trunk — Turn 'Filename' into a dynamically allocated type with no arbitrary length limit, just as I did to FontSpec yesterday. (user: simon size: 307638)

To Artifact [409bcae31a]:

File ssh.c — part of check-in [3f7657c9b5] at 2011-10-02 06:50:45 on branch trunk — While I'm crusading against arbitrary limits, here's a redesign of prompt_t to arrange that the buffer in which each prompt is stored can be reallocated larger during the input process. (user: simon size: 307233)

︙
513 514 515 516 517 518 519 ~~520 521 522~~ 523 524 525 526 527 528 529	513 514 515 516 517 518 519 520 521 522 523 524 525 526	- - -	#define SSH1_BUFFER_LIMIT 32768 #define SSH_MAX_BACKLOG 32768 #define OUR_V2_WINSIZE 16384 #define OUR_V2_BIGWIN 0x7fffffff #define OUR_V2_MAXPKT 0x4000UL #define OUR_V2_PACKETLIMIT 0x9000UL ~~/* Maximum length of passwords/passphrases (arbitrary) /~~ ~~#define SSH_MAX_PASSWORD_LEN 100~~ const static struct ssh_signkey hostkey_algs[] = { &ssh_rsa, &ssh_dss }; const static struct ssh_mac macs[] = { &ssh_hmac_sha1, &ssh_hmac_sha1_96, &ssh_hmac_md5 }; const static struct ssh_mac buggymacs[] = { &ssh_hmac_sha1_buggy, &ssh_hmac_sha1_96_buggy, &ssh_hmac_md5
︙
3522 3523 3524 3525 3526 3527 3528 ~~3529 3530~~ 3531 3532 3533 3534 3535 3536 3537	3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533	- - +	fflush(stdout); /* FIXME eh? / { if ((ssh->username = get_remote_username(ssh->conf)) == NULL) { int ret; / need not be kept over crReturn / s->cur_prompt = new_prompts(ssh->frontend); s->cur_prompt->to_server = TRUE; s->cur_prompt->name = dupstr("SSH login name"); ~~~~/ 512 is an arbitrary upper limit on username size */~~ add_prompt(s->cur_prompt, dupstr("login as: "), TRUE~~, 512~~);~~ add_prompt(s->cur_prompt, dupstr("login as: "), TRUE); ret = get_userpass_input(s->cur_prompt, NULL, 0); while (ret < 0) { ssh->send_ok = 1; crWaitUntil(!pktin); ret = get_userpass_input(s->cur_prompt, in, inlen); ssh->send_ok = 0; }
︙
3816 3817 3818 3819 3820 3821 3822 ~~3823~~ ~~3824~~ 3825 3826 3827 3828 3829 3830 3831	3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826	- + -	} else { int ret; /* need not be kept over crReturn */ s->cur_prompt = new_prompts(ssh->frontend); s->cur_prompt->to_server = FALSE; s->cur_prompt->name = dupstr("SSH key passphrase"); add_prompt(s->cur_prompt, dupprintf("Passphrase for key \"%.100s\": ", ~~s->publickey_comment),~~ s->publickey_comment), FALSE); ~~FALSE, SSH_MAX_PASSWORD_LEN);~~ ret = get_userpass_input(s->cur_prompt, NULL, 0); while (ret < 0) { ssh->send_ok = 1; crWaitUntil(!pktin); ret = get_userpass_input(s->cur_prompt, in, inlen); ssh->send_ok = 0; }
︙
3972 3973 3974 3975 3976 3977 3978 ~~3979~~ 3980 3981 3982 3983 3984 3985 3986	3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981	- +	prompt = dupstr("Response: "); } s->cur_prompt->instruction = dupprintf("Using TIS authentication.%s%s", (*instr_suf) ? "\n" : "", instr_suf); s->cur_prompt->instr_reqd = TRUE; ~~add_prompt(s->cur_prompt, prompt, FALSE~~, SSH_MAX_PASSWORD_LEN~~);~~ add_prompt(s->cur_prompt, prompt, FALSE); sfree(instr_suf); } } if (conf_get_int(ssh->conf, CONF_try_tis_auth) && (s->supported_auths_mask & (1 << SSH1_AUTH_CCARD)) && !s->ccard_auth_refused) { s->pwpkt_type = SSH1_CMSG_AUTH_CCARD_RESPONSE;
︙
4015 4016 4017 4018 4019 4020 4021 ~~4022~~ 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 ~~4035~~ 4036 4037 4038 4039 4040 4041 4042	4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037	- + - +	prompt = dupstr("Response: "); } s->cur_prompt->instruction = dupprintf("Using CryptoCard authentication.%s%s", (instr_suf) ? "\n" : "", instr_suf); s->cur_prompt->instr_reqd = TRUE; ~~add_prompt(s->cur_prompt, prompt, FALSE~~, SSH_MAX_PASSWORD_LEN~~);~~ add_prompt(s->cur_prompt, prompt, FALSE); sfree(instr_suf); } } if (s->pwpkt_type == SSH1_CMSG_AUTH_PASSWORD) { if ((s->supported_auths_mask & (1 << SSH1_AUTH_PASSWORD)) == 0) { bombout(("No supported authentication methods available")); crStop(0); } s->cur_prompt->to_server = TRUE; s->cur_prompt->name = dupstr("SSH password"); add_prompt(s->cur_prompt, dupprintf("%s@%s's password: ", ssh->username, ssh->savedhost), ~~FALSE~~, SSH_MAX_PASSWORD_LEN~~);~~ FALSE); } / * Show password prompt, having first obtained it via a TIS * or CryptoCard exchange if we're doing TIS or CryptoCard * authentication. */
︙
7671 7672 7673 7674 7675 7676 7677 ~~7678 7679~~ 7680 7681 7682 7683 7684 7685 7686	7666 7667 7668 7669 7670 7671 7672 7673 7674 7675 7676 7677 7678 7679 7680	- - +	* it again. / } else if ((ssh->username = get_remote_username(ssh->conf)) == NULL) { int ret; / need not be kept over crReturn / s->cur_prompt = new_prompts(ssh->frontend); s->cur_prompt->to_server = TRUE; s->cur_prompt->name = dupstr("SSH login name"); ~~~~/ 512 is an arbitrary limit :-( */~~ add_prompt(s->cur_prompt, dupstr("login as: "), TRUE~~, 512~~);~~ add_prompt(s->cur_prompt, dupstr("login as: "), TRUE); ret = get_userpass_input(s->cur_prompt, NULL, 0); while (ret < 0) { ssh->send_ok = 1; crWaitUntilV(!pktin); ret = get_userpass_input(s->cur_prompt, in, inlen); ssh->send_ok = 0; }
︙
8078 8079 8080 8081 8082 8083 8084 ~~8085~~ 8086 8087 8088 8089 8090 8091 8092	8072 8073 8074 8075 8076 8077 8078 8079 8080 8081 8082 8083 8084 8085 8086	- +	int ret; /* need not be kept over crReturn */ s->cur_prompt = new_prompts(ssh->frontend); s->cur_prompt->to_server = FALSE; s->cur_prompt->name = dupstr("SSH key passphrase"); add_prompt(s->cur_prompt, dupprintf("Passphrase for key \"%.100s\": ", s->publickey_comment), ~~FALSE~~, SSH_MAX_PASSWORD_LEN~~);~~ FALSE); ret = get_userpass_input(s->cur_prompt, NULL, 0); while (ret < 0) { ssh->send_ok = 1; crWaitUntilV(!pktin); ret = get_userpass_input(s->cur_prompt, in, inlen); ssh->send_ok = 0;
︙
8458 8459 8460 8461 8462 8463 8464 ~~8465~~ 8466 8467 8468 8469 8470 8471 8472	8452 8453 8454 8455 8456 8457 8458 8459 8460 8461 8462 8463 8464 8465 8466	- +	echo = ssh2_pkt_getbool(pktin); if (!prompt_len) { prompt = noprompt; prompt_len = lenof(noprompt)-1; } add_prompt(s->cur_prompt, dupprintf("%.s", prompt_len, prompt), ~~echo~~, SSH_MAX_PASSWORD_LEN~~);~~ echo); } if (name_len) { / FIXME: better prefix to distinguish from * local prompts? / s->cur_prompt->name = dupprintf("SSH server: %.s", name_len, name);
︙
8555 8556 8557 8558 8559 8560 8561 ~~8562~~ 8563 8564 8565 8566 8567 8568 8569	8549 8550 8551 8552 8553 8554 8555 8556 8557 8558 8559 8560 8561 8562 8563	- +	s->cur_prompt = new_prompts(ssh->frontend); s->cur_prompt->to_server = TRUE; s->cur_prompt->name = dupstr("SSH password"); add_prompt(s->cur_prompt, dupprintf("%s@%s's password: ", ssh->username, ssh->savedhost), ~~FALSE~~, SSH_MAX_PASSWORD_LEN~~);~~ FALSE); ret = get_userpass_input(s->cur_prompt, NULL, 0); while (ret < 0) { ssh->send_ok = 1; crWaitUntilV(!pktin); ret = get_userpass_input(s->cur_prompt, in, inlen); ssh->send_ok = 0;
︙
8657 8658 8659 8660 8661 8662 8663 ~~8664~~ 8665 ~~8666~~ 8667 ~~8668~~ 8669 8670 8671 8672 8673 8674 8675	8651 8652 8653 8654 8655 8656 8657 8658 8659 8660 8661 8662 8663 8664 8665 8666 8667 8668 8669	- + - + - +	* reluctantly, we prompt for the old password again. * * (On the other hand, some servers don't even bother * to check this field.) / add_prompt(s->cur_prompt, dupstr("Current password (blank for previously entered password): "), ~~FALSE~~, SSH_MAX_PASSWORD_LEN~~);~~ FALSE); add_prompt(s->cur_prompt, dupstr("Enter new password: "), ~~FALSE~~, SSH_MAX_PASSWORD_LEN~~);~~ FALSE); add_prompt(s->cur_prompt, dupstr("Confirm new password: "), ~~FALSE~~, SSH_MAX_PASSWORD_LEN~~);~~ FALSE); / * Loop until the user manages to enter the same * password twice. */ while (!got_new) {
︙