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
terrafrost
ef04c870e9
Merge remote-tracking branch 'bantu/bootstrap'
2016-04-09 13:04:34 -05:00
terrafrost
0d92ef31af
Update composer.lock file
2016-03-29 12:21:27 -05: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
Andreas Fischer
b48a01ec00
Merge pull request #824 from terrafrost/new-author
...
AUTHORS: add GrahamCampbell
* terrafrost/new-author:
Composer: add GrahamCampbell to composer.json
AUTHORS: add GrahamCampbell
2015-09-16 13:29:41 +02:00
Andreas Fischer
3d6fc71612
composer: Remove include path. No longer necessary due to PSR4 autoloading.
2015-08-05 13:28:36 +02: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
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
dea916189f
Updated dependencies
2015-02-07 15:35:42 +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
46075077ac
Merge branch 'master' into php5
...
* master:
Update Code Sniffer to version 1.5.6
2014-12-12 22:21:54 +01:00
Clint Nelissen
0547d182fc
Update Code Sniffer to version 1.5.6
2014-12-12 19:44:25 +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
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
420653a0a6
Update squizlabs/php_codesniffer from 1.5.2 to 1.5.5
2014-12-02 21:27:35 +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
Clint Nelissen
82de57a65f
Regenerated lock file
2014-12-02 08:45:01 -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
Andreas Fischer
3c9614991a
Add sami/sami 1.* as a development dependency.
2014-07-19 00:57:13 +02:00
Andreas Fischer
42faf9e767
Depend on PHP 5.3.2 accordingly.
2014-06-19 16:16:20 +02:00
Andreas Fischer
68ade659ba
Add PSR4 namespace to composer.json.
2014-06-02 20:17:18 +02:00
Andreas Fischer
61b0fe2ddf
Merge branch 'master' into php5
...
* master:
Run Code Sniffer via phing.
Depend on phing/phing build script.
Conflicts:
composer.lock
2014-04-12 19:33:05 +02:00
Andreas Fischer
8c9b7083d8
Depend on phing/phing build script.
2014-04-12 07:47:26 +02:00
Andreas Fischer
7b7cc829d9
Merge branch 'master' into php5
...
* master:
Update composer before using it. Fixes openssl for https error.
Install PHPUnit via Composer and update to version 4.0.
2014-04-12 06:54:55 +02:00
Andreas Fischer
86d7c6830c
Install PHPUnit via Composer and update to version 4.0.
2014-04-12 04:28:11 +02:00
Andreas Fischer
9cb25c3032
Update PHP_CodeSniffer from 1.4.7 to 1.5.2. This fixes a rule inheritance bug.
2014-02-15 19:40:19 +01:00
Andreas Fischer
6ed4e3c92e
Add composer.lock file.
2013-11-23 20:31:06 +01:00
