Switch to using SSH_MSG macros

[sgt/putty] / ssh.c

diff --git a/ssh.c b/ssh.c
index 17a5923..61e36ac 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -13,6 +13,23 @@
 
 #include "ssh.h"
 
+#define SSH_MSG_DISCONNECT 1
+#define SSH_SMSG_PUBLIC_KEY 2
+#define SSH_CMSG_SESSION_KEY 3
+#define SSH_CMSG_USER 4
+#define SSH_CMSG_AUTH_PASSWORD 9
+#define SSH_CMSG_REQUEST_PTY 10
+#define SSH_CMSG_EXEC_SHELL 12
+#define SSH_CMSG_STDIN_DATA 16
+#define SSH_SMSG_STDOUT_DATA 17
+#define SSH_SMSG_STDERR_DATA 18
+#define SSH_SMSG_SUCCESS 14
+#define SSH_SMSG_FAILURE 15
+#define SSH_SMSG_EXITSTATUS 20
+#define SSH_MSG_IGNORE 32
+#define SSH_CMSG_EXIT_CONFIRMATION 33
+#define SSH_MSG_DEBUG 36
+
 /* Coroutine mechanics for the sillier bits of the code */
 #define crBegin1       static int crLine = 0;
 #define crBegin2       switch(crLine) { case 0:;
@@ -154,8 +171,10 @@ static void ssh_gotdata(unsigned char *data, int datalen) {
        pktin.type = pktin.data[pad];
        pktin.body = pktin.data+pad+1;
 
-       if (pktin.type == 36) {        /* SSH_MSG_DEBUG */
+       if (pktin.type == SSH_MSG_DEBUG) {
            /* FIXME: log it */
+       } else if (pktin.type == SSH_MSG_IGNORE) {
+           /* do nothing */;
        } else
            ssh_protocol(NULL, 0, 1);
     }
@@ -211,6 +230,21 @@ static void s_wrpkt(void) {
     s_write(pktout.data, biglen+4);
 }
 
+static int ssh_versioncmp(char *a, char *b) {
+    char *ae, *be;
+    unsigned long av, bv;
+
+    av = strtoul(a, &ae, 10);
+    bv = strtoul(b, &be, 10);
+    if (av != bv) return (av < bv ? -1 : +1);
+    if (*ae == '.') ae++;
+    if (*be == '.') be++;
+    av = strtoul(ae, &ae, 10);
+    bv = strtoul(be, &be, 10);
+    if (av != bv) return (av < bv ? -1 : +1);
+    return 0;
+}
+
 static int do_ssh_init(void) {
     char c;
     char version[10];
@@ -246,8 +280,8 @@ static int do_ssh_init(void) {
            break;
     }
 
-    sprintf(vstring, "SSH-%s-7.7.7\n",
-           (strcmp(version, "1.5") <= 0 ? version : "1.5"));
+    sprintf(vstring, "SSH-%s-PuTTY\n",
+           (ssh_versioncmp(version, "1.5") <= 0 ? version : "1.5"));
     s_write(vstring, strlen(vstring));
     return 1;
 }
@@ -263,6 +297,7 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
     int cipher_type;
 
     extern struct ssh_cipher ssh_3des;
+    extern struct ssh_cipher ssh_des;
     extern struct ssh_cipher ssh_blowfish;
 
     crBegin;
@@ -272,7 +307,7 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
     while (!ispkt)
        crReturnV;
 
-    if (pktin.type != 2)
+    if (pktin.type != SSH_SMSG_PUBLIC_KEY)
        fatalbox("Public key packet not received");
 
     memcpy(cookie, pktin.body, 8);
@@ -320,13 +355,14 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
     }
 
     cipher_type = cfg.cipher == CIPHER_BLOWFISH ? SSH_CIPHER_BLOWFISH :
+                  cfg.cipher == CIPHER_DES ? SSH_CIPHER_DES : 
                   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);
+    s_wrpkt_start(SSH_CMSG_SESSION_KEY, len+15);
     pktout.body[0] = cipher_type;
     memcpy(pktout.body+1, cookie, 8);
     pktout.body[9] = (len*8) >> 8;
@@ -339,12 +375,13 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
     free(rsabuf);
 
     cipher = cipher_type == SSH_CIPHER_BLOWFISH ? &ssh_blowfish :
+             cipher_type == SSH_CIPHER_DES ? &ssh_des :
              &ssh_3des;
     cipher->sesskey(session_key);
 
     do { crReturnV; } while (!ispkt);
 
-    if (pktin.type != 14)
+    if (pktin.type != SSH_SMSG_SUCCESS)
        fatalbox("Encryption not successfully enabled");
 
     fflush(stdout);
@@ -394,7 +431,7 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
            sprintf(stuff, "Sent username \"%s\".\r\n", username);
            c_write(stuff, strlen(stuff));
        }
-       s_wrpkt_start(4, 4+strlen(username));
+       s_wrpkt_start(SSH_CMSG_USER, 4+strlen(username));
        pktout.body[0] = pktout.body[1] = pktout.body[2] = 0;
        pktout.body[3] = strlen(username);
        memcpy(pktout.body+4, username, strlen(username));
@@ -403,7 +440,7 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
 
     do { crReturnV; } while (!ispkt);
 
-    while (pktin.type == 15) {
+    while (pktin.type == SSH_SMSG_FAILURE) {
        static char password[100];
        static int pos;
        static char c;
@@ -434,7 +471,7 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
            }
        }
        c_write("\r\n", 2);
-       s_wrpkt_start(9, 4+strlen(password));
+       s_wrpkt_start(SSH_CMSG_AUTH_PASSWORD, 4+strlen(password));
        pktout.body[0] = pktout.body[1] = pktout.body[2] = 0;
        pktout.body[3] = strlen(password);
        memcpy(pktout.body+4, password, strlen(password));
@@ -450,7 +487,7 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
 
     if (!cfg.nopty) {
         i = strlen(cfg.termtype);
-        s_wrpkt_start(10, i+5*4+1);
+        s_wrpkt_start(SSH_CMSG_REQUEST_PTY, i+5*4+1);
         pktout.body[0] = (i >> 24) & 0xFF;
         pktout.body[1] = (i >> 16) & 0xFF;
         pktout.body[2] = (i >> 8) & 0xFF;
@@ -469,14 +506,14 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
         s_wrpkt();
         ssh_state = SSH_STATE_INTERMED;
         do { crReturnV; } while (!ispkt);
-        if (pktin.type != 14 && pktin.type != 15) {
+        if (pktin.type != SSH_MSG_SUCCESS && pktin.type != SSH_MSG_FAILURE) {
             fatalbox("Protocol confusion");
-        } else if (pktin.type == 15) {
+        } else if (pktin.type == SSH_MSG_FAILURE) {
             c_write("Server refused to allocate pty\r\n", 32);
         }
     }
 
-    s_wrpkt_start(12, 0);
+    s_wrpkt_start(SSH_CMSG_EXEC_SHELL, 0);
     s_wrpkt();
 
     ssh_state = SSH_STATE_SESSION;
@@ -486,28 +523,27 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
     while (1) {
        crReturnV;
        if (ispkt) {
-           if (pktin.type == 17 || pktin.type == 18) {
+           if (pktin.type == SSH_SMSG_STDOUT_DATA ||
+                pktin.type == SSH_SMSG_STDERR_DATA) {
                long len = 0;
                for (i = 0; i < 4; i++)
                    len = (len << 8) + pktin.body[i];
                c_write(pktin.body+4, len);
-           } else if (pktin.type == 1) {
-               /* SSH_MSG_DISCONNECT */
+           } else if (pktin.type == 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) {
-               /* SSH_MSG_FAILURE: may be from EXEC_SHELL on some servers
+           } else if (pktin.type == SSH_MSG_SUCCESS) {
+               /* may be from EXEC_SHELL on some servers */
+           } else if (pktin.type == SSH_MSG_FAILURE) {
+               /* may be from EXEC_SHELL on some servers
                 * if no pty is available or in other odd cases. Ignore */
-           } else if (pktin.type == 20) {
-               /* EXITSTATUS */
-               s_wrpkt_start(33, 0);
+           } else if (pktin.type == SSH_SMSG_EXITSTATUS) {
+               s_wrpkt_start(SSH_CMSG_EXIT_CONFIRMATION, 0);
                s_wrpkt();
            } else {
                fatalbox("Strange packet received: type %d", pktin.type);
            }
        } else {
-           s_wrpkt_start(16, 4+inlen);
+           s_wrpkt_start(SSH_CMSG_STDIN_DATA, 4+inlen);
            pktout.body[0] = (inlen >> 24) & 0xFF;
            pktout.body[1] = (inlen >> 16) & 0xFF;
            pktout.body[2] = (inlen >> 8) & 0xFF;