From: Simon Tatham <anakin@pobox.com>
Date: Sat, 7 Nov 2015 09:54:05 +0000 (+0000)
Subject: Merge tag '0.66'
X-Git-Tag: 0.68~335
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8fdeb3a95cc3d7dce5629fc22e309eb3c996f44d;p=PuTTY.git

Merge tag '0.66'

This brings in the rest of the 0.66 branch, including some changes new
on master.

Conflicts:
        doc/plink.but
        sshrsa.c

(The conflicts were both trivial: in one, the addition of an extra
parameter to rsa2_newkey on master happened on the line next to 0.66's
addition of a check for NULL return value, and in the other, I'd got
the version number in the plink -h transcript messed up on master.)
---

8fdeb3a95cc3d7dce5629fc22e309eb3c996f44d
diff --cc sshrsa.c
index 850204c7,5c1991ef..e565a64a
--- a/sshrsa.c
+++ b/sshrsa.c
@@@ -772,7 -767,9 +772,9 @@@ static int rsa2_pubkey_bits(const struc
      struct RSAKey *rsa;
      int ret;
  
 -    rsa = rsa2_newkey((char *) blob, len);
 +    rsa = rsa2_newkey(self, (const char *) blob, len);
+     if (!rsa)
+ 	return -1;
      ret = bignum_bitcount(rsa->modulus);
      rsa2_freekey(rsa);