nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

Fix a segfault in parsing OpenSSH private key files.

Browse Source 
The initial test for a line ending with "PRIVATE KEY-----" failed to
take into account the possibility that the line might be shorter than
that. Fixed by introducing a new library function strendswith(), and
strstartswith() for good measure, and using that.

Thanks to Hanno Böck for spotting this, with the aid of AFL.
This commit is contained in:
Simon Tatham 2015-11-10 18:47:55 +00:00
parent a454399ec8
commit fa7b23ce90
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
import.c
View File

@ -383,8 +383,8 @@ static struct openssh_pem_key *load_openssh_pem_key(const Filename *filename,
goto error; goto error;
} }
strip_crlf(line); strip_crlf(line);
if (0 != strncmp(line, "-----BEGIN ", 11) || if (!strstartswith(line, "-----BEGIN ") ||
0 != strcmp(line+strlen(line)-16, "PRIVATE KEY-----")) { !strendswith(line, "PRIVATE KEY-----")) {
errmsg = "file does not begin with OpenSSH key header"; errmsg = "file does not begin with OpenSSH key header";
goto error; goto error;
} }
@ -421,8 +421,8 @@ static struct openssh_pem_key *load_openssh_pem_key(const Filename *filename,
goto error; goto error;
} }
strip_crlf(line); strip_crlf(line);
if (0 == strncmp(line, "-----END ", 9) && if (strstartswith(line, "-----END ") &&
0 == strcmp(line+strlen(line)-16, "PRIVATE KEY-----")) { strendswith(line, "PRIVATE KEY-----")) {
sfree(line); sfree(line);
line = NULL; line = NULL;
break; /* done */ break; /* done */

11
misc.c
View File

@ -1087,3 +1087,14 @@ int get_ssh_uint32(int *datalen, const void **data, unsigned *ret)
*data = (const char *)*data + 4; *data = (const char *)*data + 4;
return TRUE; return TRUE;
} }
int strstartswith(const char *s, const char *t)
{
return !memcmp(s, t, strlen(t));
}
int strendswith(const char *s, const char *t)
{
size_t slen = strlen(s), tlen = strlen(t);
return slen >= tlen && !strcmp(s + (slen - tlen), t);
}

2
misc.h
View File

@ -52,6 +52,8 @@ int toint(unsigned);
char *fgetline(FILE *fp); char *fgetline(FILE *fp);
char *chomp(char *str); char *chomp(char *str);
int strstartswith(const char *s, const char *t);
int strendswith(const char *s, const char *t);
void base64_encode_atom(const unsigned char *data, int n, char *out); void base64_encode_atom(const unsigned char *data, int n, char *out);
int base64_decode_atom(const char *atom, unsigned char *out); int base64_decode_atom(const char *atom, unsigned char *out);