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

pageant_get_keylist: fix handling of bad SSH-1 data from agent.

Browse Source 
Coverity points out that if rsa_ssh1_public_blob_len sees data it
doesn't like, it returns -1 to indicate an error. But the code that
uses it to parse the SSH1_AGENT_RSA_IDENTITIES_ANSWER payload was
passing it directly to get_data() as a length field, without checking
for that case. Now we do check it, and use it to set the existing
kl->broken flag that indicates that the key list was not correctly
formatted.
This commit is contained in:
Simon Tatham 2021-04-09 18:21:40 +01:00
parent edadfa7093
commit d53b3bcd22
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pageant.c
View File

@ -1897,8 +1897,13 @@ static KeyList *pageant_get_keylist(unsigned ssh_version)
for (size_t i = 0; i < kl->nkeys && !get_err(pco); i++) { for (size_t i = 0; i < kl->nkeys && !get_err(pco); i++) {
if (ssh_version == 1) { if (ssh_version == 1) {
kl->keys[i].blob = get_data(pco, rsa_ssh1_public_blob_len( int bloblen = rsa_ssh1_public_blob_len(
make_ptrlen(get_ptr(pco), get_avail(pco)))); make_ptrlen(get_ptr(pco), get_avail(pco)));
if (bloblen < 0) {
kl->broken = true;
bloblen = 0;
}
kl->keys[i].blob = get_data(pco, bloblen);
} else { } else {
kl->keys[i].blob = get_string(pco); kl->keys[i].blob = get_string(pco);
} }
@ -1915,7 +1920,8 @@ static KeyList *pageant_get_keylist(unsigned ssh_version)
} }
} }
kl->broken = get_err(pco); if (get_err(pco))
kl->broken = true;
kl->raw_data = pco->buf; kl->raw_data = pco->buf;
pco->buf = NULL; pco->buf = NULL;
pageant_client_op_free(pco); pageant_client_op_free(pco);