INCOMPATIBLE CHANGE to the SSH2 private key file format. There is

[u/mdw/putty] / plink.c

diff --git a/plink.c b/plink.c
index 80c5b6a..8d4701a 100644 (file)
--- a/plink.c
+++ b/plink.c
@@ -162,6 +162,25 @@ void askcipher(char *ciphername, int cs)
     }
 }
 
+/*
+ * Warn about the obsolescent key file format.
+ */
+void old_keyfile_warning(void)
+{
+    static const char message[] =
+       "You are loading an SSH 2 private key which has an\n"
+       "old version of the file format. This means your key\n"
+       "file is not fully tamperproof. Future versions of\n"
+       "PuTTY may stop supporting this private key format,\n"
+       "so we recommend you convert your key to the new\n"
+       "format.\n"
+       "\n"
+       "Once the key is loaded into PuTTYgen, you can perform\n"
+       "this conversion simply by saving it again.\n";
+
+    fputs(message, stderr);
+}
+
 HANDLE inhandle, outhandle, errhandle;
 DWORD orig_console_mode;
 
@@ -346,6 +365,10 @@ static void usage(void)
     printf("  -P port   connect to specified port\n");
     printf("  -pw passw login with specified password\n");
     printf("  -m file   read remote command(s) from file\n");
+    printf("  -L listen-port:host:port   Forward local port to "
+          "remote address\n");
+    printf("  -R listen-port:host:port   Forward remote port to"
+          " local address\n");
     exit(1);
 }
 
@@ -383,6 +406,7 @@ int main(int argc, char **argv)
     SOCKET *sklist;
     int skcount, sksize;
     int connopen;
+    char extra_portfwd[sizeof(cfg.portfwd)];
 
     ssh_get_line = get_line;
 
@@ -441,6 +465,24 @@ int main(int argc, char **argv)
                --argc, username = *++argv;
                strncpy(cfg.username, username, sizeof(cfg.username));
                cfg.username[sizeof(cfg.username) - 1] = '\0';
+           } else if ((!strcmp(p, "-L") || !strcmp(p, "-R")) && argc > 1) {
+               char *fwd, *ptr, *q;
+               int i=0;
+               --argc, fwd = *++argv;
+               ptr = extra_portfwd;
+               /* if multiple forwards, find end of list */
+               if (ptr[0]=='R' || ptr[0]=='L') {
+                   for (i = 0; i < sizeof(extra_portfwd) - 2; i++)
+                       if (ptr[i]=='\000' && ptr[i+1]=='\000')
+                           break;
+                   ptr = ptr + i + 1;  /* point to next forward slot */
+               }
+               ptr[0] = p[1];  /* insert a 'L' or 'R' at the start */
+               strncpy(ptr+1, fwd, sizeof(extra_portfwd) - i);
+               q = strchr(ptr, ':');
+               if (q) *q = '\t';      /* replace first : with \t */
+               ptr[strlen(ptr)+1] = '\000';    /* append two '\000' */
+               extra_portfwd[sizeof(extra_portfwd) - 1] = '\0';
            } else if (!strcmp(p, "-m") && argc > 1) {
                char *filename, *command;
                int cmdlen, cmdsize;
@@ -591,6 +633,32 @@ int main(int argc, char **argv)
        usage();
     }
 
+    /*
+     * Trim leading whitespace off the hostname if it's there.
+     */
+    {
+       int space = strspn(cfg.host, " \t");
+       memmove(cfg.host, cfg.host+space, 1+strlen(cfg.host)-space);
+    }
+
+    /* See if host is of the form user@host */
+    if (cfg.host[0] != '\0') {
+       char *atsign = strchr(cfg.host, '@');
+       /* Make sure we're not overflowing the user field */
+       if (atsign) {
+           if (atsign - cfg.host < sizeof cfg.username) {
+               strncpy(cfg.username, cfg.host, atsign - cfg.host);
+               cfg.username[atsign - cfg.host] = '\0';
+           }
+           memmove(cfg.host, atsign + 1, 1 + strlen(atsign + 1));
+       }
+    }
+
+    /*
+     * Trim a colon suffix off the hostname if it's there.
+     */
+    cfg.host[strcspn(cfg.host, ":")] = '\0';
+
     if (!*cfg.remote_cmd_ptr)
        flags |= FLAG_INTERACTIVE;
 
@@ -614,6 +682,30 @@ int main(int argc, char **argv)
     }
 
     /*
+     * Add extra port forwardings (accumulated on command line) to
+     * cfg.
+     */
+    {
+       int i;
+       char *p;
+       p = extra_portfwd;
+       i = 0;
+       while (cfg.portfwd[i])
+           i += strlen(cfg.portfwd+i) + 1;
+       while (*p) {
+           if (strlen(p)+2 > sizeof(cfg.portfwd)-i) {
+               fprintf(stderr, "Internal fault: not enough space for all"
+                       " port forwardings\n");
+               break;
+           }
+           strncpy(cfg.portfwd+i, p, sizeof(cfg.portfwd)-i-1);
+           i += strlen(cfg.portfwd+i) + 1;
+           cfg.portfwd[i] = '\0';
+           p += strlen(p)+1;
+       }
+    }
+
+    /*
      * Select port.
      */
     if (portnumber != -1)