X11 authentication data are generally sensitive, so blank them from packet

[PuTTY.git] / ssh.c

diff --git a/ssh.c b/ssh.c
index 0f6793ad4013573a31288a4c2e6e5eae823c9f35..6fe865b7be6972190c54791777ff11cc45fdf54e 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -2410,6 +2410,8 @@ static int do_ssh_init(Ssh ssh, unsigned char c)
                   strcspn(verstring, "\015\012"), verstring);
        sk_write(ssh->s, verstring, strlen(verstring));
         sfree(verstring);
+       if (ssh->version == 2)
+           do_ssh2_transport(ssh, NULL, -1, NULL);
     }
 
     logeventf(ssh, "Using SSH protocol version %d", ssh->version);
@@ -7312,7 +7314,9 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
        ssh2_pkt_addbool(s->pktout, 1);        /* want reply */
        ssh2_pkt_addbool(s->pktout, 0);        /* many connections */
        ssh2_pkt_addstring(s->pktout, proto);
+       dont_log_password(ssh, s->pktout, PKTLOG_BLANK);
        ssh2_pkt_addstring(s->pktout, data);
+       end_log_omission(ssh, s->pktout);
        ssh2_pkt_adduint32(s->pktout, x11_get_screen_number(ssh->cfg.x11_display));
        ssh2_pkt_send(ssh, s->pktout);