nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 01:02:24 +00:00
Code Issues Projects Releases Wiki Activity

Fixes to make r6434 actually useful.

Browse Source 
[originally from svn r6435]
[r6434 == c14f259ba2]
This commit is contained in:
Jacob Nevins 2005-10-30 16:28:45 +00:00
parent c14f259ba2
commit ff05fb7ccc
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sshpubk.c
View File

@ -71,11 +71,6 @@ static int loadrsakey_main(FILE * fp, struct RSAKey *key, int pub_only,
if (i < 0) if (i < 0)
goto end; /* overran */ goto end; /* overran */
if (pub_only) {
ret = 1;
goto end;
}
/* Next, the comment field. */ /* Next, the comment field. */
j = GET_32BIT(buf + i); j = GET_32BIT(buf + i);
i += 4; i += 4;
@ -88,9 +83,17 @@ static int loadrsakey_main(FILE * fp, struct RSAKey *key, int pub_only,
} }
i += j; i += j;
if (commentptr) if (commentptr)
*commentptr = comment; *commentptr = dupstr(comment);
if (key) if (key)
key->comment = comment; key->comment = comment;
else
sfree(comment);
if (pub_only) {
ret = 1;
goto end;
}
if (!key) { if (!key) {
ret = ciphertype != 0; ret = ciphertype != 0;
*error = NULL; *error = NULL;