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

Remove a return path from sshcom_write() which was both unreachable

Browse Source 
(it would trigger if !type==RSA and !type==DSA, but one of those must
have been true to get there in the first place) and erroneous (it
would return NULL without going through the cleanup code). Since the
code's internal structure guarantees that path isn't reached, replace
it with an assert.

[originally from svn r9924]
This commit is contained in:
Simon Tatham 2013-07-14 10:46:39 +00:00
parent 7554dd5a9c
commit 1dabc578a9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
import.c
View File

@ -1473,7 +1473,8 @@ struct ssh2_userkey *sshcom_read(const Filename *filename, char *passphrase,
pos += put_mp(blob+pos, p.start, p.bytes);
pos += put_mp(blob+pos, u.start, u.bytes);
privlen = pos - publen;
} else if (type == DSA) {
} else {
assert(type == DSA); /* the only other option from the if above */
struct mpint_pos p, q, g, x, y;
int pos = 4;
if (GET_32BIT(ciphertext) != 0) {
@ -1500,8 +1501,7 @@ struct ssh2_userkey *sshcom_read(const Filename *filename, char *passphrase,
publen = pos;
pos += put_mp(blob+pos, x.start, x.bytes);
privlen = pos - publen;
} else
return NULL;
}
assert(privlen > 0); /* should have bombed by now if not */