Tweak documentation of -V option.

[u/mdw/putty] / ssh.c

diff --git a/ssh.c b/ssh.c
index 33da993..89fa785 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -2535,6 +2535,22 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen, int ispkt)
     ssh->crcda_ctx = crcda_make_context();
     logevent("Installing CRC compensation attack detector");
 
+    if (servkey.modulus) {
+       sfree(servkey.modulus);
+       servkey.modulus = NULL;
+    }
+    if (servkey.exponent) {
+       sfree(servkey.exponent);
+       servkey.exponent = NULL;
+    }
+    if (hostkey.modulus) {
+       sfree(hostkey.modulus);
+       hostkey.modulus = NULL;
+    }
+    if (hostkey.exponent) {
+       sfree(hostkey.exponent);
+       hostkey.exponent = NULL;
+    }
     crWaitUntil(ispkt);
 
     if (ssh->pktin.type != SSH1_SMSG_SUCCESS) {
@@ -2751,6 +2767,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen, int ispkt)
                    if (s->authed)
                        break;
                }
+               sfree(s->response);
            }
            if (s->authed)
                break;
@@ -3037,6 +3054,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen, int ispkt)
                    }
                    logevent("Sending password with camouflage packets");
                    ssh_pkt_defersend(ssh);
+                   sfree(randomstr);
                } 
                else if (!(ssh->remote_bugs & BUG_NEEDS_SSH1_PLAIN_PASSWORD)) {
                    /*
@@ -3302,6 +3320,7 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt)
            } else {
                while (*ssh->portfwd_strptr) ssh->portfwd_strptr++;
                dport = dserv = -1;
+               ssh->portfwd_strptr++; /* eat the NUL and move to next one */
            }
            sport = atoi(sports);
            sserv = 0;
@@ -4337,6 +4356,12 @@ static int do_ssh2_transport(Ssh ssh, unsigned char *in, int inlen, int ispkt)
     if (ssh->sccomp->text_name)
        logeventf(ssh, "Initialised %s decompression",
                  ssh->sccomp->text_name);
+    freebn(s->f);
+    freebn(s->K);
+    if (ssh->kex == &ssh_diffiehellman_gex) {
+       freebn(s->g);
+       freebn(s->p);
+    }
 
     /*
      * If this is the first key exchange phase, we must pass the
@@ -4719,6 +4744,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
 
            s->method = 0;
            ssh->pkt_ctx &= ~SSH2_PKTCTX_AUTH_MASK;
+           s->need_pw = FALSE;
 
            /*
             * Most password/passphrase prompts will be
@@ -4898,6 +4924,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
                    if (s->authed)
                        continue;
                }
+               sfree(s->response);
            }
 
            if (!s->method && s->can_pubkey && s->publickey_blob
@@ -5171,6 +5198,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
 
                    ssh2_pkt_send(ssh);
                    s->type = AUTH_TYPE_PUBLICKEY;
+                   key->alg->freekey(key->data);
                }
            } else if (s->method == AUTH_PASSWORD) {
                /*
@@ -5418,6 +5446,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
            } else {
                while (*ssh->portfwd_strptr) ssh->portfwd_strptr++;
                dport = dserv = -1;
+               ssh->portfwd_strptr++; /* eat the NUL and move to next one */
            }
            sport = atoi(sports);
            sserv = 0;
@@ -6239,10 +6268,18 @@ static void ssh_free(void *handle)
        ssh->csmac->free_context(ssh->cs_mac_ctx);
     if (ssh->sc_mac_ctx)
        ssh->scmac->free_context(ssh->sc_mac_ctx);
-    if (ssh->cs_comp_ctx)
-       ssh->cscomp->compress_cleanup(ssh->cs_comp_ctx);
-    if (ssh->sc_comp_ctx)
-       ssh->sccomp->compress_cleanup(ssh->sc_comp_ctx);
+    if (ssh->cs_comp_ctx) {
+       if (ssh->cscomp)
+           ssh->cscomp->compress_cleanup(ssh->cs_comp_ctx);
+       else
+           zlib_compress_cleanup(ssh->cs_comp_ctx);
+    }
+    if (ssh->sc_comp_ctx) {
+       if (ssh->sccomp)
+           ssh->sccomp->decompress_cleanup(ssh->sc_comp_ctx);
+       else
+           zlib_decompress_cleanup(ssh->sc_comp_ctx);
+    }
     if (ssh->kex_ctx)
        dh_cleanup(ssh->kex_ctx);
     sfree(ssh->savedhost);
@@ -6276,7 +6313,22 @@ static void ssh_free(void *handle)
     sfree(ssh->do_ssh1_login_state);
     sfree(ssh->do_ssh2_transport_state);
     sfree(ssh->do_ssh2_authconn_state);
-    
+    if (ssh->pktout.data) {
+       sfree(ssh->pktout.data);
+       ssh->pktout.data = NULL;
+    }
+    if (ssh->pktin.data) {
+       sfree(ssh->pktin.data);
+       ssh->pktin.data = NULL;
+    }
+    if (ssh->crcda_ctx) {
+       crcda_free_context(ssh->crcda_ctx);
+       ssh->crcda_ctx = NULL;
+    }
+    if (ssh->logctx) {
+       log_free(ssh->logctx);
+       ssh->logctx = NULL;
+    }
     if (ssh->s)
        ssh_do_close(ssh);
     sfree(ssh);