X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/c5e9c988d0706d1abb7fab7b2d2b1514bc119584..6c4edc71a0877c4d3376f60466064119ff17c707:/ssh.c

diff --git a/ssh.c b/ssh.c
index 93a12807..d31d823e 100644
--- a/ssh.c
+++ b/ssh.c
@@ -101,6 +101,9 @@ static void c_write (char *buf, int len) {
 	if (new_head != inbuf_reap) {
 	    inbuf[inbuf_head] = *buf++;
 	    inbuf_head = new_head;
+	} else {
+            term_out();
+            if( inbuf_head == inbuf_reap ) len++; else break;
 	}
     }
 }
@@ -382,7 +385,21 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
     if (!rsabuf)
 	fatalbox("Out of memory");
 
-    verify_ssh_host_key(savedhost, &hostkey);
+    /*
+     * Verify the host key.
+     */
+    {
+        /*
+         * First format the key into a string.
+         */
+        int len = rsastr_len(&hostkey);
+        char *keystr = malloc(len);
+        if (!keystr)
+            fatalbox("Out of memory");
+        rsastr_fmt(keystr, &hostkey);
+        verify_ssh_host_key(savedhost, keystr);
+        free(keystr);
+    }
 
     for (i=0; i<32; i++) {
 	rsabuf[i] = session_key[i];
@@ -772,14 +789,22 @@ static int ssh_msg (WPARAM wParam, LPARAM lParam) {
     int ret;
     char buf[256];
 
-    if (s == INVALID_SOCKET)	       /* how the hell did we get here?! */
-	return -5000;
+    /*
+     * Because reading less than the whole of the available pending
+     * data can generate an FD_READ event, we need to allow for the
+     * possibility that FD_READ may arrive with FD_CLOSE already in
+     * the queue; so it's possible that we can get here even with s
+     * invalid. If so, we return 1 and don't worry about it.
+     */
+    if (s == INVALID_SOCKET)
+	return 1;
 
     if (WSAGETSELECTERROR(lParam) != 0)
 	return -WSAGETSELECTERROR(lParam);
 
     switch (WSAGETSELECTEVENT(lParam)) {
       case FD_READ:
+      case FD_CLOSE:
 	ret = recv(s, buf, sizeof(buf), 0);
 	if (ret < 0 && WSAGetLastError() == WSAEWOULDBLOCK)
 	    return 1;
@@ -787,14 +812,10 @@ static int ssh_msg (WPARAM wParam, LPARAM lParam) {
 	    return -10000-WSAGetLastError();
 	if (ret == 0) {
 	    s = INVALID_SOCKET;
-	    return 0;		       /* can't happen, in theory */
+	    return 0;
 	}
 	ssh_gotdata (buf, ret);
 	return 1;
-      case FD_CLOSE:
-	s = INVALID_SOCKET;
-        ssh_state = SSH_STATE_CLOSED;
-	return 0;
     }
     return 1;			       /* shouldn't happen, but WTF */
 }