PuTTy: Diff

Differences From Artifact [29b7b2563a]:

File ssh.c — part of check-in [5b5937160f] at 2006-08-29 14:07:11 on branch trunk — New logging mode, which records the exact bytes sent over the wire in an SSH connection _in addition_ to the decrypted packets. This will hopefully come in useful for debugging wire data corruption issues: you can strace the server, enable this mode in the client, and compare the sent and received data. I'd _like_ to have this mode also log Diffie-Hellman private exponents, session IDs, encryption and MAC keys, so that the resulting log file could be used to independently verify the correctness of all cryptographic operations performed by PuTTY. However, I haven't been able to convince myself that the security implications are acceptable. (It doesn't matter that this information would permit an attacker to decrypt the session, because the _already_ decrypted session is stored alongside it in the log file. And I'm not planning, under any circumstances, to log users' private keys. But gaining access to the log file while the session was still running would permit an attacker to _hijack_ the session, and that's the iffy bit.) (user: simon size: 264136)

To Artifact [6dcc6f85bd]:

File ssh.c — part of check-in [2887f76e0f] at 2006-09-05 16:39:30 on branch trunk — Slight change to password expiry UI for the benefit of Cisco servers, which are as usual slightly odd. (user: jacob size: 265265)

︙
7493 7494 7495 7496 7497 7498 7499 7500 7501 7502 7503 7504 7505 7506	7493 7494 7495 7496 7497 7498 7499 7500 7501 7502 7503 7504 7505 7506 7507 7508 7509 7510 7511 7512 7513 7514 7515 7516 7517 7518 7519 7520 7521	+ + + + + + + + + + + + + + +	s->cur_prompt = new_prompts(ssh->frontend); s->cur_prompt->to_server = TRUE; s->cur_prompt->name = dupstr("New SSH password"); s->cur_prompt->instruction = dupprintf("%.s", prompt_len, prompt); s->cur_prompt->instr_reqd = TRUE; / * There's no explicit requirement in the protocol * for the "old" passwords in the original and * password-change messages to be the same, and * apparently some Cisco kit supports password change * by the user entering a blank password originally * and the real password subsequently, so, * 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); add_prompt(s->cur_prompt, dupstr("Enter new password: "), FALSE, SSH_MAX_PASSWORD_LEN); add_prompt(s->cur_prompt, dupstr("Confirm new password: "), FALSE, SSH_MAX_PASSWORD_LEN); / * Loop until the user manages to enter the same
︙
7526 7527 7528 7529 7530 7531 7532 ~~7533~~ 7534 ~~7535 7536~~ 7537 7538 7539 7540 7541 7542 7543	7541 7542 7543 7544 7545 7546 7547 7548 7549 7550 7551 7552 7553 7554 7555 7556 7557 7558 7559 7560 7561 7562 7563 7564 7565 7566 7567 7568 7569 7570 7571 7572 7573	+ + + + + + + + + + + + + + + - + - - + +	ssh_disconnect(ssh, NULL, "Unable to authenticate", SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER, TRUE); crStopV; } /* * If the user specified a new original password * (IYSWIM), overwrite any previously specified * one. * (A side effect is that the user doesn't have to * re-enter it if they louse up the new password.) / if (s->cur_prompt->prompts[0]->result[0]) { memset(s->password, 0, strlen(s->password)); / burn the evidence / sfree(s->password); s->password = dupstr(s->cur_prompt->prompts[0]->result); } / * Check the two passwords match. * Check the two new passwords match. / ~~got_new = (strcmp(s->cur_prompt->prompts[0]->result, s->cur_prompt->prompts[1]->result)~~ got_new = (strcmp(s->cur_prompt->prompts[1]->result, s->cur_prompt->prompts[2]->result) == 0); if (!got_new) / They don't. Silly user. */ c_write_str(ssh, "Passwords do not match\r\n"); }
︙
7551 7552 7553 7554 7555 7556 7557 ~~7558~~ 7559 7560 7561 7562 7563 7564 7565	7581 7582 7583 7584 7585 7586 7587 7588 7589 7590 7591 7592 7593 7594 7595	- +	ssh2_pkt_addstring(s->pktout, "ssh-connection"); /* service requested / ssh2_pkt_addstring(s->pktout, "password"); ssh2_pkt_addbool(s->pktout, TRUE); dont_log_password(ssh, s->pktout, PKTLOG_BLANK); ssh2_pkt_addstring(s->pktout, s->password); ssh2_pkt_addstring(s->pktout, ~~s->cur_prompt->prompts[0]->result);~~ s->cur_prompt->prompts[1]->result); free_prompts(s->cur_prompt); end_log_omission(ssh, s->pktout); ssh2_pkt_send(ssh, s->pktout); logevent("Sent new password"); / * Now see what the server has to say about it.
︙