mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-25 09:12:24 +00:00
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 == c14f259ba2
]
This commit is contained in:
parent
ff05fb7ccc
commit
d6c13bd154
6
cmdgen.c
6
cmdgen.c
@ -690,8 +690,8 @@ int main(int argc, char **argv)
|
|||||||
char *blob;
|
char *blob;
|
||||||
int n, l, bloblen;
|
int n, l, bloblen;
|
||||||
|
|
||||||
ret = rsakey_pubblob(&infilename, &vblob, &bloblen, NULL,
|
ret = rsakey_pubblob(&infilename, &vblob, &bloblen,
|
||||||
&error);
|
&origcomment, &error);
|
||||||
blob = (char *)vblob;
|
blob = (char *)vblob;
|
||||||
|
|
||||||
n = 4; /* skip modulus bits */
|
n = 4; /* skip modulus bits */
|
||||||
@ -709,7 +709,7 @@ int main(int argc, char **argv)
|
|||||||
} else
|
} else
|
||||||
n += l;
|
n += l;
|
||||||
}
|
}
|
||||||
ssh1key->comment = NULL;
|
ssh1key->comment = dupstr(origcomment);
|
||||||
ssh1key->private_exponent = NULL;
|
ssh1key->private_exponent = NULL;
|
||||||
} else {
|
} else {
|
||||||
ret = loadrsakey(&infilename, ssh1key, passphrase, &error);
|
ret = loadrsakey(&infilename, ssh1key, passphrase, &error);
|
||||||
|
Loading…
Reference in New Issue
Block a user