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 fc420ef..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;
 
@@ -447,7 +466,7 @@ int main(int argc, char **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;
+               char *fwd, *ptr, *q;
                int i=0;
                --argc, fwd = *++argv;
                ptr = extra_portfwd;
@@ -460,7 +479,8 @@ int main(int argc, char **argv)
                }
                ptr[0] = p[1];  /* insert a 'L' or 'R' at the start */
                strncpy(ptr+1, fwd, sizeof(extra_portfwd) - i);
-               ptr[strcspn(ptr, ":")] = '\t';  /* replace first : with \t */
+               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) {