nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-02 03:52:49 -05:00
Code Issues Projects Releases Wiki Activity

Add ability for ssh2_userkey_loadpub() to return the key comment.

Browse Source 
(Not actually used currently, but it makes life easier for a patch I'm
working on.)

[originally from svn r6433]
This commit is contained in:
Jacob Nevins
2005-10-30 13:42:36 +00:00
parent 69ac38c1a8
commit 49d2cf19ac
5 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sshpubk.c
View File

@ -866,7 +866,8 @@ struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
}
char *ssh2_userkey_loadpub(const Filename *filename, char **algorithm,
int *pub_blob_len, const char **errorstr)
int *pub_blob_len, char **commentptr,
const char **errorstr)
{
FILE *fp;
char header[40], *b;
@ -875,6 +876,7 @@ char *ssh2_userkey_loadpub(const Filename *filename, char **algorithm,
int public_blob_len;
int i;
const char *error = NULL;
char *comment;
public_blob = NULL;
@ -912,9 +914,13 @@ char *ssh2_userkey_loadpub(const Filename *filename, char **algorithm,
/* Read the Comment header line. */
if (!read_header(fp, header) || 0 != strcmp(header, "Comment"))
goto error;
if ((b = read_body(fp)) == NULL)
if ((comment = read_body(fp)) == NULL)
goto error;
sfree(b); /* we don't care */
if (commentptr)
*commentptr = comment;
else
sfree(comment);
/* Read the Public-Lines header line and the public blob. */
if (!read_header(fp, header) || 0 != strcmp(header, "Public-Lines"))