X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=ssh.c;h=ef503bf52160e96503828ad72bbd5d67c377031e;hb=a46aac386b20e6474d45f701a96d7afc8cfdafec;hp=505b4ae1dcb811773d9a77d4158bfffbd7bf7715;hpb=7c61b3c73342a59f1b219eff1cebef9440d16524;p=PuTTY.git

diff --git a/ssh.c b/ssh.c
index 505b4ae1..ef503bf5 100644
--- a/ssh.c
+++ b/ssh.c
@@ -5778,6 +5778,12 @@ static int do_ssh2_transport(Ssh ssh, void *vin, int inlen,
 		break;
 	    }
 	}
+	if (!ssh->hostkey) {
+	    bombout(("Couldn't agree a host key algorithm (available: %s)",
+		     str ? str : "(null)"));
+	    crStop(0);
+	}
+
 	s->guessok = s->guessok &&
 	    first_in_commasep_string(hostkey_algs[0]->name, str, len);
 	ssh_pkt_getstring(pktin, &str, &len);    /* client->server cipher */
@@ -10037,6 +10043,12 @@ static void ssh_unthrottle(void *handle, int bufsize)
 	    }
 	}
     }
+
+    /*
+     * Now process any SSH connection data that was stashed in our
+     * queue while we were frozen.
+     */
+    ssh_process_queued_incoming_data(ssh);
 }
 
 void ssh_send_port_open(void *channel, char *hostname, int port, char *org)