X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/614a20a0312335b76fb7a080c73b36cf81965d86..4252c9cc7d88ca10cfaeaea2dd2510aabfdc0f38:/ssh.c

diff --git a/ssh.c b/ssh.c
index 23cfdaac..4a6db9f6 100644
--- a/ssh.c
+++ b/ssh.c
@@ -607,12 +607,6 @@ static int ssh1_rdpkt(unsigned char **data, int *datalen)
 	(*data)++, (*datalen)--;
     }
 
-#ifdef FWHACK
-    if (st->len == 0x52656d6f) {       /* "Remo"te server has closed ... */
-	st->len = 0x300;	       /* big enough to carry to end */
-    }
-#endif
-
     st->pad = 8 - (st->len % 8);
     st->biglen = st->len + st->pad;
     pktin.length = st->len - 5;
@@ -726,6 +720,7 @@ static int ssh1_rdpkt(unsigned char **data, int *datalen)
 	buf[nowlen + msglen] = '\0';
 	logevent(buf);
 	bombout(("Server sent disconnect message:\n\"%s\"", buf+nowlen));
+	crReturn(0);
     }
 
     crFinish(0);
@@ -769,11 +764,7 @@ static int ssh2_rdpkt(unsigned char **data, int *datalen)
 	pktin.data[st->i] = *(*data)++;
 	(*datalen)--;
     }
-#ifdef FWHACK
-    if (!memcmp(pktin.data, "Remo", 4)) {	/* "Remo"te server has closed ... */
-	/* FIXME */
-    }
-#endif
+
     if (sccipher)
 	sccipher->decrypt(pktin.data, st->cipherblk);
 
@@ -904,6 +895,7 @@ static int ssh2_rdpkt(unsigned char **data, int *datalen)
 		 (reason > 0 && reason < lenof(ssh2_disconnect_reasons)) ?
 		 ssh2_disconnect_reasons[reason] : "unknown",
 		 buf+nowlen));
+	crReturn(0);
     }
 
     crFinish(0);
@@ -1600,6 +1592,9 @@ static void ssh_gotdata(unsigned char *data, int datalen)
     while (1) {
 	while (datalen > 0) {
 	    if (s_rdpkt(&data, &datalen) == 0) {
+		if (ssh_state == SSH_STATE_CLOSED) {
+		    return;
+		}
 		ssh_protocol(NULL, 0, 1);
 		if (ssh_state == SSH_STATE_CLOSED) {
 		    return;
@@ -3000,6 +2995,15 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt)
 		 * if no pty is available or in other odd cases. Ignore */
 	    } else if (pktin.type == SSH1_SMSG_EXIT_STATUS) {
 		send_packet(SSH1_CMSG_EXIT_CONFIRMATION, PKT_END);
+                /*
+                 * In case `helpful' firewalls or proxies tack
+                 * extra human-readable text on the end of the
+                 * session which we might mistake for another
+                 * encrypted packet, we close the session once
+                 * we've sent EXIT_CONFIRMATION.
+                 */
+                ssh_state = SSH_STATE_CLOSED;
+                crReturnV;
 	    } else {
 		bombout(("Strange packet received: type %d", pktin.type));
 		crReturnV;