Rebranch some files on 'ben-mac-port' from trunk.

[PuTTY.git] / ssh.c

diff --git a/ssh.c b/ssh.c
index c9718db7575c3894b85969000b527c4b12361670..17a59238461306c245ef04378cbec712d0bfcd16 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1,10 +1,16 @@
 #include <stdio.h>
 #include <stdlib.h>
-#ifndef macintosh
 #include <winsock.h>
-#endif /* not macintosh */
 
 #include "putty.h"
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef TRUE
+#define TRUE 1
+#endif
+
 #include "ssh.h"
 
 /* Coroutine mechanics for the sillier bits of the code */
@@ -24,10 +30,15 @@
 #define crStop(z)      do{ crLine = 0; return (z); }while(0)
 #define crStopV                do{ crLine = 0; return; }while(0)
 
-#ifndef macintosh
-static SOCKET s = INVALID_SOCKET;
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef TRUE
+#define TRUE 1
 #endif
 
+static SOCKET s = INVALID_SOCKET;
+
 static unsigned char session_key[32];
 static struct ssh_cipher *cipher = NULL;
 
@@ -36,16 +47,12 @@ static char *savedhost;
 static enum {
     SSH_STATE_BEFORE_SIZE,
     SSH_STATE_INTERMED,
-    SSH_STATE_SESSION
+    SSH_STATE_SESSION,
+    SSH_STATE_CLOSED
 } ssh_state = SSH_STATE_BEFORE_SIZE;
 
 static int size_needed = FALSE;
 
-#ifdef macintosh
-static void s_write (unsigned char *buf, int len) {
-    panic("s_write not implemented");
-}
-#else /* not macintosh */
 static void s_write (char *buf, int len) {
     while (len > 0) {
        int i = send (s, buf, len, 0);
@@ -53,13 +60,7 @@ static void s_write (char *buf, int len) {
            len -= i, buf += i;
     }
 }
-#endif /* not macintosh */
 
-#ifdef macintosh
-static int s_read (unsigned char *buf, int len) {
-    panic("s_read not implemented");
-}
-#else /* not macintosh */
 static int s_read (char *buf, int len) {
     int ret = 0;
     while (len > 0) {
@@ -71,12 +72,10 @@ static int s_read (char *buf, int len) {
     }
     return ret;
 }
-#endif
 
 static void c_write (char *buf, int len) {
     while (len--) {
        int new_head = (inbuf_head + 1) & INBUF_MASK;
-       int c = (unsigned char) *buf;
        if (new_head != inbuf_reap) {
            inbuf[inbuf_head] = *buf++;
            inbuf_head = new_head;
@@ -101,10 +100,8 @@ static void ssh_size(void);
 
 static void ssh_gotdata(unsigned char *data, int datalen) {
     static long len, biglen, to_read;
-    static unsigned char c, *p;
+    static unsigned char *p;
     static int i, pad;
-    static char padding[8];
-    static unsigned char word[4];
 
     crBegin;
     while (1) {
@@ -175,8 +172,8 @@ static void s_wrpkt_start(int type, int len) {
     pktout.length = len-5;
     if (pktout.maxlen < biglen) {
        pktout.maxlen = biglen;
-       pktout.data = (pktout.data == NULL ? malloc(biglen) :
-                      realloc(pktout.data, biglen));
+       pktout.data = (pktout.data == NULL ? malloc(biglen+4) :
+                      realloc(pktout.data, biglen+4));
        if (!pktout.data)
            fatalbox("Out of memory");
     }
@@ -215,7 +212,7 @@ static void s_wrpkt(void) {
 }
 
 static int do_ssh_init(void) {
-    unsigned char c;
+    char c;
     char version[10];
     char vstring[40];
     int i;
@@ -251,7 +248,7 @@ static int do_ssh_init(void) {
 
     sprintf(vstring, "SSH-%s-7.7.7\n",
            (strcmp(version, "1.5") <= 0 ? version : "1.5"));
-    s_write((unsigned char *)vstring, strlen(vstring));
+    s_write(vstring, strlen(vstring));
     return 1;
 }
 
@@ -262,8 +259,11 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
     unsigned char cookie[8];
     struct RSAKey servkey, hostkey;
     struct MD5Context md5c;
+    unsigned long supported_ciphers_mask;
+    int cipher_type;
 
     extern struct ssh_cipher ssh_3des;
+    extern struct ssh_cipher ssh_blowfish;
 
     crBegin;
 
@@ -283,6 +283,11 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
 
     j = makekey(pktin.body+8+i, &hostkey, &keystr2);
 
+    supported_ciphers_mask = (pktin.body[12+i+j] << 24) |
+                             (pktin.body[13+i+j] << 16) |
+                             (pktin.body[14+i+j] << 8) |
+                             (pktin.body[15+i+j]);
+
     MD5Update(&md5c, keystr2, hostkey.bytes);
     MD5Update(&md5c, keystr1, servkey.bytes);
     MD5Update(&md5c, pktin.body, 8);
@@ -314,8 +319,15 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
        rsaencrypt(rsabuf, hostkey.bytes, &servkey);
     }
 
+    cipher_type = cfg.cipher == CIPHER_BLOWFISH ? SSH_CIPHER_BLOWFISH :
+                  SSH_CIPHER_3DES;
+    if ((supported_ciphers_mask & (1 << cipher_type)) == 0) {
+       c_write("Selected cipher not supported, falling back to 3DES\r\n", 53);
+       cipher_type = SSH_CIPHER_3DES;
+    }
+
     s_wrpkt_start(3, len+15);
-    pktout.body[0] = 3;                       /* SSH_CIPHER_3DES */
+    pktout.body[0] = cipher_type;
     memcpy(pktout.body+1, cookie, 8);
     pktout.body[9] = (len*8) >> 8;
     pktout.body[10] = (len*8) & 0xFF;
@@ -326,7 +338,8 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
 
     free(rsabuf);
 
-    cipher = &ssh_3des;
+    cipher = cipher_type == SSH_CIPHER_BLOWFISH ? &ssh_blowfish :
+             &ssh_3des;
     cipher->sesskey(session_key);
 
     do { crReturnV; } while (!ispkt);
@@ -477,9 +490,10 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
                long len = 0;
                for (i = 0; i < 4; i++)
                    len = (len << 8) + pktin.body[i];
-               c_write((char *)pktin.body+4, len);
+               c_write(pktin.body+4, len);
            } else if (pktin.type == 1) {
-               /* SSH_MSG_DISCONNECT: do nothing */
+               /* SSH_MSG_DISCONNECT */
+                ssh_state = SSH_STATE_CLOSED;
            } else if (pktin.type == 14) {
                /* SSH_MSG_SUCCESS: may be from EXEC_SHELL on some servers */
            } else if (pktin.type == 15) {
@@ -648,6 +662,7 @@ static int ssh_msg (WPARAM wParam, LPARAM lParam) {
        return 1;
       case FD_CLOSE:
        s = INVALID_SOCKET;
+        ssh_state = SSH_STATE_CLOSED;
        return 0;
     }
     return 1;                         /* shouldn't happen, but WTF */
@@ -669,6 +684,7 @@ static void ssh_send (char *buf, int len) {
 static void ssh_size(void) {
     switch (ssh_state) {
       case SSH_STATE_BEFORE_SIZE:
+      case SSH_STATE_CLOSED:
        break;                         /* do nothing */
       case SSH_STATE_INTERMED:
        size_needed = TRUE;            /* buffer for later */