In Unix PuTTYgen, existing SSH-1 key comments were coming out as "(null)"

for operations not performing decryption (e.g., "puttygen rsa1.ppk -L")
(A use for r6434 -- wasn't expecting that.)

[originally from svn r6436]
[r6434 == c14f259ba2ebd7963c987af5811c8244c455317d]

diff --git a/cmdgen.c b/cmdgen.c
index 13c9ca13c755d927c4aae0db3c7f6880928aaa14..20c0d1175f91055a9e9116477474818b9e8a5afc 100644 (file)
--- a/cmdgen.c
+++ b/cmdgen.c
@@ -690,8 +690,8 @@ int main(int argc, char **argv)
                char *blob;
                int n, l, bloblen;
 
-               ret = rsakey_pubblob(&infilename, &vblob, &bloblen, NULL,
-                                    &error);
+               ret = rsakey_pubblob(&infilename, &vblob, &bloblen,
+                                    &origcomment, &error);
                blob = (char *)vblob;
 
                n = 4;                 /* skip modulus bits */
@@ -709,7 +709,7 @@ int main(int argc, char **argv)
                    } else
                        n += l;
                }
-               ssh1key->comment = NULL;
+               ssh1key->comment = dupstr(origcomment);
                ssh1key->private_exponent = NULL;
            } else {
                ret = loadrsakey(&infilename, ssh1key, passphrase, &error);