17df55ae63
Update constraint
2020-11-07 21:12:19 +01:00
da042c720f
Change namespace
2019-12-18 14:00:20 +01:00
a9816a9283
Fork
2019-12-18 13:59:34 +01:00
terrafrost
653dbd7f94
rename phpseclib/phpseclib to phpseclib/phpseclib3 for 3.0 branch
2019-11-21 19:38:03 -06:00
terrafrost
ce8ad063c7
Merge branch '2.0'
2017-12-14 23:52:18 -06:00
terrafrost
b02d78e92a
Merge branch '1.0' into 2.0
2017-12-14 23:49:10 -06:00
Remi Collet
8dc8642473
allow PHPUnit 4, 5 and 6
2017-12-14 23:25:30 -06:00
terrafrost
15863ff588
Merge branch '2.0-travis-exp' into master-travis-exp
2017-12-03 22:38:03 -06:00
terrafrost
1587c5498b
Merge branch '1.0-travis-exp' into 2.0-travis-exp
2017-12-03 20:22:57 -06:00
terrafrost
2e2c22b921
Travis: enable PHP 7.2 support
2017-12-03 15:33:15 -06:00
terrafrost
6f6b93b012
BigInteger/GMP: use gmp_import / gmp_export
2017-11-05 12:33:22 -06:00
terrafrost
9f7a925bf4
Composer: update deps
2017-08-29 22:42:24 -05:00
terrafrost
863ff6789b
RSA: refactor PKCS1/PKCS8 to facilitate re-use
2016-11-17 08:09:10 -06:00
terrafrost
1fb9c81233
Composer: include bootstrap before Crypt/Random
2016-10-22 11:13:01 -05:00
terrafrost
a478b13930
Composer: fix autoloading for 1.0 branch
2016-10-17 23:25:21 -05:00
Paragon Initiative Enterprises
0e8fa93676
Use paragonie/constant_time_encoding
2016-05-12 16:28:40 -04:00
terrafrost
398a795e1f
Revert "undo merging of master to 2.0 branch"
...
This reverts commit 8fb4c3363d
2016-04-30 16:23:35 -05:00
terrafrost
8fb4c3363d
undo merging of master to 2.0 branch
2016-04-28 15:34:10 -05:00
terrafrost
b4cf10fc94
Revert "Merge branch '2.0'"
...
This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing
changes made to 638fe6971c
2016-04-10 11:30:59 -05:00
terrafrost
4b69dcb1ca
Revert "Merge remote-tracking branch 'bantu/bootstrap'"
...
This reverts commit ef04c870e9cd57bf31ae
2016-04-10 11:25:31 -05:00
Andreas Fischer
29659f877d
Add bootstrap.php checking environment (MB_OVERLOAD_STRING).
2016-04-09 17:40:25 -05:00
terrafrost
ef04c870e9
Merge remote-tracking branch 'bantu/bootstrap'
2016-04-09 13:04:34 -05:00
Scott
bdb9935e35
Update composer.json
2016-03-24 17:10:07 -04:00
Paragon Initiative Enterprises
1ca62c2c33
Use random_compat
2016-03-24 16:44:56 -04:00
Andreas Fischer
cb0f1a57e6
Merge branch '1.0' into 2.0
...
* 1.0:
Composer: add GrahamCampbell to composer.json
AUTHORS: add GrahamCampbell
Conflicts:
composer.lock
2015-09-16 13:31:01 +02:00
terrafrost
fae274f9c9
Composer: add GrahamCampbell to composer.json
2015-09-15 19:12:57 -05:00
Andreas Fischer
3d6fc71612
composer: Remove include path. No longer necessary due to PSR4 autoloading.
2015-08-05 13:28:36 +02:00
terrafrost
761173bb7f
composer.json: rm pear-pear/PHP_Compat
2015-08-04 07:15:35 -05:00
terrafrost
a74aa9efbe
composer.json: rm bom
2015-08-03 23:48:03 -05:00
terrafrost
33685080fb
Merge branch '1.0' into 2.0
...
Conflicts:
composer.json
2015-08-03 23:23:10 -05:00
terrafrost
844134df95
update phpseclib to 1.0.0
2015-08-03 21:22:12 -05:00
Andreas Fischer
cd57bf31ae
Add bootstrap.php checking environment (MB_OVERLOAD_STRING).
2015-08-03 17:07:20 +02:00
Andreas Fischer
58f8affcad
SSH2: Add support for curve25519-sha256@libssh.org.txt via libsodium-php.
2015-07-27 22:58:59 +02:00
Andreas Fischer
d9e9504fba
Merge branch 'PSR2-1.0' into PSR2-2.0
...
* PSR2-1.0:
Fix indentation phpcbf did not fix.
Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
Use phpcbf to fix PHP code to ruleset.
Ignore coding guidelines in ANSI switch block.
Base code sniffer ruleset on PSR2 rather than PEAR.
Update PHP Code Sniffer to 2.3.3
Conflicts:
build/code-sniffer-ruleset-tests.xml
build/code-sniffer-ruleset.xml
composer.lock
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RSA.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
tests/Unit/Crypt/TwofishTest.php
2015-07-17 13:41:59 +02:00
Andreas Fischer
00f17aa956
Update PHP Code Sniffer to 2.3.3
2015-07-17 12:57:04 +02:00
terrafrost
3cb685337a
composer.json: update PHP_Compat requirements
2015-05-24 12:10:12 -05:00
Andreas Fischer
578be7f30a
Merge branch '1.0' into 2.0
...
* 1.0:
PHP 5.2 is not supported by travis anymore
Updated dependencies
Removed old branch alias
Conflicts:
composer.json
composer.lock
2015-02-08 16:58:37 +01:00
Graham Campbell
790463cbc7
Removed old branch alias
2015-02-07 15:35:37 +00:00
Andreas Fischer
3f7dc96a2b
composer.json: Remove PSR0 autoload statements.
2015-01-28 13:52:42 +01:00
Andreas Fischer
293df05546
Require PHP 5.3.3 since that is the lowest version we are running tests on.
2015-01-06 20:55:36 +01:00
Andreas Fischer
74d0b8ccce
Merge branch 'master' into php5
...
* master:
Updated dependencies
Conflicts:
composer.lock
2014-12-03 12:30:55 +01:00
Graham Campbell
91511b7c5c
Updated dependencies
2014-12-02 21:25:47 +00:00
Andreas Fischer
cd10ded72e
Merge pull request #508 from cnelissen/RandomAsClass
...
Promote Crypt/Random.php to a fully qualified class
* cnelissen/RandomAsClass:
Removed includes for Random.php and fixed up user_error message
Renamed Random::crypt_random_string to Random::string
Regenerated lock file
Namespaced Crypt\Random
Code sniff fix
Initial commit
Conflicts:
composer.lock
2014-12-02 21:56:21 +01:00
Andreas Fischer
946aa08aec
Merge pull request #515 from GrahamCampbell/patch-1
...
Alias the php5 branch as 2.0.x for now
* GrahamCampbell/patch-1:
Alias the php5 branch as 2.0.x for now
2014-12-02 21:50:38 +01:00
Andreas Fischer
885359bf21
Merge branch 'master' into php5
...
* master:
Update squizlabs/php_codesniffer from 1.5.2 to 1.5.5
Update phpunit/phpunit to 4.3.*
Update sami/sami to 2.*
Conflicts:
composer.lock
2014-12-02 21:41:01 +01:00
Andreas Fischer
cd6e50bfb9
Update phpunit/phpunit to 4.3.*
2014-12-02 21:23:58 +01:00
Andreas Fischer
a71ace33ad
Update sami/sami to 2.*
2014-12-02 21:23:40 +01:00
Graham Campbell
0cbfbbbdf9
Alias the php5 branch as 2.0.x for now
2014-12-02 19:47:06 +00:00
Clint Nelissen
9c0c3faeb7
Initial commit
2014-12-01 18:54:44 -08:00
Andreas Fischer
01a176b3d3
Merge branch 'master' into php5
...
* master:
Add api target to phing build script.
Add sami configuration file.
Add sami/sami 1.* as a development dependency.
Conflicts:
composer.lock
2014-07-20 21:22:19 +02:00
