merge fixes from PuTTY import.c toint() from misc.c (revids are from hggit conversion) changeset: 4620:60a336a6c85c user: Simon Tatham <[email protected]> date: Thu Feb 25 20:26:33 2016 +0000 files: import.c description: Fix potential segfaults in reading OpenSSH's ASN.1 key format. The length coming back from ber_read_id_len might have overflowed, so treat it as potentially negative. Also, while I'm here, accumulate it inside ber_read_id_len as an unsigned, so as to avoid undefined behaviour on integer overflow, and toint() it before return. Thanks to Hanno Böck for spotting this, with the aid of AFL. (cherry picked from commit 5b7833cd474a24ec098654dcba8cb9509f3bf2c1) Conflicts: import.c (cherry-picker's note: resolving the conflict involved removing an entire section of the original commit which fixed ECDSA code not present on this branch) changeset: 4619:9c6c638d98d8 user: Simon Tatham <[email protected]> date: Sun Jul 14 10:45:54 2013 +0000 files: import.c ssh.c sshdss.c sshpubk.c sshrsa.c description: Tighten up a lot of casts from unsigned to int which are read by one of the GET_32BIT macros and then used as length fields. Missing bounds checks against zero have been added, and also I've introduced a helper function toint() which casts from unsigned to int in such a way as to avoid C undefined behaviour, since I'm not sure I trust compilers any more to do the obviously sensible thing. [originally from svn r9918] changeset: 4618:3957829f24d3 user: Simon Tatham <[email protected]> date: Mon Jul 08 22:36:04 2013 +0000 files: import.c sshdss.c sshrsa.c description: Add an assortment of extra safety checks. [originally from svn r9896] changeset: 4617:2cddee0bce12 user: Jacob Nevins <[email protected]> date: Wed Dec 07 00:24:45 2005 +0000 files: import.c description: Institutional failure to memset() things pointed at rather than pointers. Things should now be zeroed and memory not leaked. Spotted by Brant Thomsen. [originally from svn r6476] changeset: 4616:24ac78a9c71d user: Simon Tatham <[email protected]> date: Wed Feb 11 13:58:27 2004 +0000 files: import.c description: Jacob's last-minute testing found a couple of trivial bugs in import.c, and my attempts to reproduce them in cmdgen found another one there :-) [originally from svn r3847] changeset: 4615:088d39a73db0 user: Simon Tatham <[email protected]> date: Thu Jan 22 18:52:49 2004 +0000 files: import.c description: Placate some gcc warnings. [originally from svn r3761] changeset: 4614:e4288bad4d93 parent: 1758:108b8924593d user: Simon Tatham <[email protected]> date: Fri Oct 03 21:21:23 2003 +0000 files: import.c description: My ASN.1 decoder returned wrong IDs for anything above 0x1E! Good job it's never had to yet. Ahem. [originally from svn r3479]

265       562
389       882
509      1207
631      1572
750      1990
859      2433
991      2894
1109      3555
1230      4228
1350      5018
1471      5805
1591      6579
1709      7415
1829      8329
1949      9225
2071     10139
2188     11239
2309     12178
2431     13212
2551     14294
2671     15551
2791     16512
2911     17718
3030     18876
3150     20259
3270     21374
3391     22650
3511     23948
3631     25493
3750     26756
3870     28225
3989     29705
4110     31409
4230     32834
4351     34327
4471     35818
4591     37636
4711     39228
4830     40868
4949     42393
5070     44541
5191     46269
5310     48162
5429     49728
5548     51985
5671     53948
5791     55885
5910     57584
6031     60082
6150     62239
6270     64309
6390     66014
6511     68766
6631     71012
6750     73172
6871     74952
6991     77909
7111     80371
7231     82666
7351     84531
7469     87698
7589     90318
7711    225384
7830    232428
7950    240009
8070    246522
8190    253662
8310    260961
8431    269253
8549    275743
8671    283769
8789    290811
8911    300034
9030    306873
9149    315085
9270    323944
9390    332390
9508    337519
9631    348986
9749    356904
9871    367013
9989    373831
10108    381033
10230    393475