From a607fe54c9f20934b57e29e9040b9dd0a4decf3a Mon Sep 17 00:00:00 2001 From: simon Date: Sun, 14 Jul 2013 10:46:39 +0000 Subject: [PATCH] Remove a return path from sshcom_write() which was both unreachable (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. git-svn-id: svn://svn.tartarus.org/sgt/putty@9924 cda61777-01e9-0310-a592-d414129be87e --- import.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/import.c b/import.c index d4b87bc7..77a32437 100644 --- a/import.c +++ b/import.c @@ -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 */ -- 2.11.0