Commit Graph

2575 Commits

Author SHA1 Message Date
terrafrost
b54b5b5945 Merge branch '2.0' 2016-10-04 08:59:32 -05:00
terrafrost
7bc7c8c63e Merge branch '1.0' into 2.0 2016-10-04 08:59:18 -05:00
terrafrost
d760d97fc8 CHANGELOG: add 1.0.4 release 2016-10-04 08:57:29 -05:00
terrafrost
d66b6c251c Merge branch '2.0' 2016-10-03 19:57:11 -05:00
terrafrost
ab8028c93c Merge branch '1.0' into 2.0 2016-10-03 19:57:04 -05:00
terrafrost
2dfe9c5de7 README: update download link to 1.0.4 2016-10-03 19:56:50 -05:00
terrafrost
4f4de2df28 Merge branch '2.0' 2016-10-02 22:09:05 -05:00
terrafrost
88e58c75d0 don't go out of our way to support < PHP 5.3
...not when phpseclib 2.0 requires PHP 5.3+
2016-10-02 22:07:33 -05:00
terrafrost
7ae4ea3e71 Merge branch '1.0' into 2.0 2016-10-02 21:56:59 -05:00
terrafrost
3c149e0e6a Merge branch '1.0-32bit-fixes' into 1.0 2016-10-02 21:39:16 -05:00
terrafrost
711079764e Merge branch '2.0' 2016-10-02 08:18:16 -05:00
terrafrost
42f5399960 Crypt/Base: fix bad merge 2016-10-02 08:09:54 -05:00
terrafrost
42fb96db16 fix float to int conversions on 32-bit linux PHP < 5.3 installs 2016-10-02 03:37:23 -05:00
terrafrost
3205c95177 Merge branch '1.0' into 2.0 2016-10-01 20:05:16 -05:00
terrafrost
0fc6c6c9f6 Merge branch '1.0-php71' into 1.0 2016-10-01 20:02:58 -05:00
terrafrost
e81b8d90d3 Travis: PHP 7.1 tweaks 2016-09-24 11:57:59 -05:00
terrafrost
d68975117c RC2: rm empty constructor 2016-09-23 21:55:26 -05:00
terrafrost
a862837a9a Merge remote-tracking branch 'origin/danog2' 2016-09-23 10:20:07 -05:00
terrafrost
640f10609f fix PHP 7.1 compatibility errors 2016-09-21 01:21:54 -05:00
terrafrost
e4489a1765 fix PHP 7.1 compatibility errors 2016-09-21 01:03:26 -05:00
Thomas Müller
d7295e827c Adding php 7.1 to travis 2016-09-20 18:56:58 -05:00
terrafrost
8019baee62 BigInteger: add randomRange / randomPrimeRange
...and redo random / randomPrime such that they take the byte size
as the parameter instead of the range.
2016-09-17 19:48:51 -07:00
terrafrost
c17a2604a0 Merge branch 'master-reorg' 2016-09-17 09:15:11 -07:00
terrafrost
bf9489c28d Merge branch '2.0' 2016-09-11 22:27:30 -07:00
terrafrost
c1d407d7cf Merge branch '1.0' into 2.0 2016-09-11 21:22:53 -07:00
terrafrost
ff7bc85a8f SFTP: backport "parallel" upload code from master branch 2016-09-11 21:11:52 -07:00
terrafrost
03937a7933 Merge branch '2.0' 2016-09-10 11:16:52 -07:00
terrafrost
222ad56285 Merge branch '1.0' into 2.0 2016-09-10 11:04:52 -07:00
terrafrost
845135f887 add PHP5-style constructors along side PHP4-style ones 2016-09-10 10:41:05 -07:00
terrafrost
0ee24aa218 BigInteger: rm loopforeach method 2016-09-09 20:59:54 -08:00
terrafrost
72d1bdf60b a few changes to danog's changes 2016-09-08 00:22:30 -08:00
terrafrost
6f22a957c2 Merge branch '2.0' 2016-08-28 23:17:11 -05:00
terrafrost
f30f8045fd Merge branch '1.0' into 2.0 2016-08-28 23:17:06 -05:00
Michel Bardelmeijer
1eda62913a Handle empty fread return correctly which resolves zero-byte file issues 2016-08-28 23:16:53 -05:00
terrafrost
020bcdab29 Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0 2016-08-28 10:48:45 -05:00
terrafrost
80440047e8 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2016-08-28 10:45:48 -05:00
terrafrost
5416b9eddc Merge branch '2.0' 2016-08-28 10:45:37 -05:00
terrafrost
6dc50cc5c9 ASN1: update unit test for 2.0 branch 2016-08-28 10:45:31 -05:00
terrafrost
281cfcdcea Merge branch '1.0' into 2.0 2016-08-28 10:45:04 -05:00
terrafrost
5c2ffd2544 ASN1: fix infinite loop during ASN1 decode process 2016-08-28 10:43:33 -05:00
terrafrost
47faa5736e RSA/PKCS8: CS adjustment 2016-08-18 14:53:21 -05:00
terrafrost
77c29d774f Merge branch '2.0' 2016-08-18 13:49:32 -05:00
terrafrost
8b4ead6aef Merge branch 'master' of https://github.com/phpseclib/phpseclib 2016-08-18 13:49:28 -05:00
terrafrost
41f85e9c25 Merge branch '1.0' into 2.0 2016-08-18 13:49:14 -05:00
terrafrost
c27fd2e66f updates for 1.0.3 release 2016-08-18 13:43:04 -05:00
terrafrost
da0c41ddac Merge branch '2.0' 2016-08-11 23:10:43 -05:00
terrafrost
c20b661a44 SSH2: don't check for carriage return in version id string 2016-08-11 23:09:38 -05:00
terrafrost
719fb8d7a8 Merge branch '2.0' of https://github.com/phpseclib/phpseclib into 2.0 2016-08-04 07:32:07 -05:00
terrafrost
e6a2ce1d6d Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0 2016-08-04 07:30:46 -05:00
terrafrost
cc75d317a8 Merge branch '2.0' 2016-08-04 01:08:20 -05:00