Commit Graph

2759 Commits

Author SHA1 Message Date
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
terrafrost
ffdac88f17 Merge branch '1.0' into 2.0 2016-08-04 01:07:55 -05:00
terrafrost
12f70270cd fix bad cherry pick 2016-08-04 01:06:52 -05:00
terrafrost
676c1982c7 fix bad merge 2016-08-04 01:04:00 -05:00
terrafrost
1a25aefa59 cherry-picking last commit added new file 2016-08-04 00:55:21 -05:00
terrafrost
3a53545eb7 Merge branch '2.0' 2016-08-04 00:52:16 -05:00
klemens
dd23d91d41 spelling fixes 2016-08-04 00:47:52 -05:00
terrafrost
c547ee16c7 Merge branch '1.0' into 2.0 2016-08-04 00:31:15 -05:00
klemens
dca95ac662 spelling fixes 2016-08-04 00:19:27 -05:00
danogentili
7cf300984c Added root, pow, max, min, loopforeach functions and tests. 2016-08-03 10:51:19 -04:00
terrafrost
d64599f799 Move _encodeLength and _decodeLength to Common\Functions\ASN1.php 2016-07-31 09:37:13 -05:00
terrafrost
c509909004 Organizational Revamp
- rename \phpseclib\Crypt\Base to \phpseclib\Crypt\Common\SymmetricKey
- create BlockCipher and StreamCipher to extend SymmetricKey
- replace _string_shift with \phpseclib\Common\Functions\Strings::shift
2016-07-30 22:18:06 -05:00
terrafrost
ec62e5d9f5 RSA: update PKCS1/8 comments 2016-07-28 22:14:37 -05:00
terrafrost
c12500cace RSA: code cleanup 2016-07-28 13:08:47 -05:00
terrafrost
06ed64ef3d Merge branch 'master' of https://github.com/phpseclib/phpseclib 2016-07-28 11:01:44 -05:00
terrafrost
caa7eed299 Merge branch '2.0' 2016-07-28 11:00:33 -05:00
terrafrost
eff01fba0e RSA: update phpdoc for 2.0 branch 2016-07-28 11:00:16 -05:00