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]

271       560
388       878
511      1179
629      1625
751      1988
871      2423
989      2896
1111      3561
1231      4209
1350      5015
1470      5804
1591      6556
1709      7420
1831      8263
1951      9173
2070     10153
2191     11229
2310     12167
2431     13211
2550     14309
2671     15524
2788     16525
2910     17712
3028     18822
3148     20220
3271     21343
3391     22652
3511     23944
3630     25485
3750     26778
3868     28201
3990     29653
4111     31393
4225     32841
4350     34328
4471     35786
4590     37652
4711     39245
4830     40876
4951     42433
5068     44547
5191     46321
5311     48140
5430     49727
5550     52034
5671     53954
5791     55921
5908     57597
6031     60084
6148     62226
6270     64295
6390     66045
6511     68779
6629     71003
6751     73169
6871     74992
6991     77895
7110     80376
7231     82628
7351     84468
7470     87664
7591     90284
7711     91352
7828     93995
7950     96276
8071     98691
8190    101256
8308    103631
8431    105222
8550    108343
8671    110281
8787    112764
8911    115397
9031    117690
9151    120266
9271    122715
9391    124624
9510    127937
9630    130313
9750    132914
9871    136129
9991    138517
10108    141525
10231    144225