octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-19 11:45:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,005 Commits 4 Branches 121 Tags 19 MiB
864493bbf6
Commit Graph

2005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
864493bbf6 Merge pull request #790 from cweagans/switch-to-extension-loaded-2.0 
Switch to extension loaded (2.0)

* cweagans/switch-to-extension-loaded-2.0:
  Remove conditions for PHP < 5.3.0 for this branch
  Switch to extension_loaded('gmp')
  Switch to extension_loaded instead of function_exists where it makes sense
 2015-09-04 15:05:40 +02:00
Andreas Fischer
5cfa3a584e Merge branch '1.0' into 2.0 
* 1.0:
  Remove unnecessary parens
  Convert most instances of function_exists() to extension_loaded() where applicable

Conflicts:
	phpseclib/Crypt/Random.php
	phpseclib/Math/BigInteger.php
 2015-09-04 15:05:22 +02:00
Andreas Fischer
e08e2fd300 Merge pull request #791 from cweagans/switch-to-extension-loaded-1.0 
Switch to extension loaded (1.0)

* cweagans/switch-to-extension-loaded-1.0:
  Remove unnecessary parens
  Convert most instances of function_exists() to extension_loaded() where applicable
 2015-09-04 15:04:17 +02:00
Cameron Eagans
8206061a30 Remove unnecessary parens 2015-09-02 15:22:37 -04:00
Andreas Fischer
40927a4033 Merge pull request #802 from GrahamForks/2.0-phpdoc 
[2.0] PHPDoc Fixes

* GrahamForks/2.0-phpdoc:
  Fixed lots of phpdoc typos
  Fixed invalid param phpdoc
 2015-09-02 20:47:45 +02:00
Andreas Fischer
1aa911d4a3 Merge branch '1.0' into 2.0 
* 1.0:
  Fixed lots of phpdoc typos
  Fixed invalid param phpdoc

Conflicts:
	phpseclib/Crypt/AES.php
	phpseclib/Crypt/Base.php
	phpseclib/Crypt/Blowfish.php
	phpseclib/Crypt/DES.php
	phpseclib/Crypt/Hash.php
	phpseclib/Crypt/RC2.php
	phpseclib/Crypt/RC4.php
	phpseclib/Crypt/RSA.php
	phpseclib/Crypt/Random.php
	phpseclib/Crypt/Rijndael.php
	phpseclib/Crypt/TripleDES.php
	phpseclib/Crypt/Twofish.php
	phpseclib/File/ASN1.php
	phpseclib/File/X509.php
	phpseclib/Math/BigInteger.php
	phpseclib/Net/SCP.php
	phpseclib/Net/SFTP.php
	phpseclib/Net/SSH1.php
	phpseclib/Net/SSH2.php
	phpseclib/System/SSH/Agent.php
 2015-09-02 20:47:28 +02:00
Andreas Fischer
e1bd0dfaf5 Merge pull request #801 from GrahamForks/1.0-phpdoc 
[1.0] PHPDoc Fixes

* GrahamForks/1.0-phpdoc:
  Fixed lots of phpdoc typos
  Fixed invalid param phpdoc
 2015-09-02 20:43:38 +02:00
Andreas Fischer
9691924b31 Merge pull request #794 from cweagans/php7-random-bytes-2.0 
Use random_bytes() when appropriate (2.0)

* cweagans/php7-random-bytes-2.0:
  Remove duplicate allow_failures section
  Test on PHP 7 & allow failures
  Coding standards fix
  Switch from EngineException to Error
  Remove string assignment
  Use random_bytes() when appropriate.
 2015-09-02 20:38:02 +02:00
Andreas Fischer
79e90801bc Merge pull request #805 from bantu/travis-php-7.0-2.0 
Backport to 2.0: Add PHP7 to Travis CI.

* bantu/travis-php-7.0-2.0:
  Backport to 2.0: Add PHP7 to Travis CI.
 2015-09-02 20:37:56 +02:00
Andreas Fischer
1b93e0bf38 Backport to 2.0: Add PHP7 to Travis CI. 
Cherry pick of 2813e2cd3b.
 2015-09-02 20:26:11 +02:00
Andreas Fischer
9fbc0358bb Merge branch '1.0' into 2.0 
* 1.0:
  X509: updates to getOID() as suggested by bantu
  X509: add getOID() method
 2015-09-02 15:06:35 +02:00
Andreas Fischer
04e68212fe Merge pull request #789 from terrafrost/oid-changes 
X509: add getOID() method

* terrafrost/oid-changes:
  X509: updates to getOID() as suggested by bantu
  X509: add getOID() method
 2015-09-02 15:05:53 +02:00
Andreas Fischer
07dd7955c4 Merge branch '1.0' into 2.0 
* 1.0:
  Test on php 5.5.9 too
 2015-09-02 14:52:44 +02:00
Andreas Fischer
bdd6159d82 Merge pull request #797 from GrahamCampbell/patch-1 
[1.0] Test on php 5.5.9 too

* GrahamCampbell/patch-1:
  Test on php 5.5.9 too
 2015-09-02 14:52:44 +02:00
Graham Campbell
634c1c2a18 Fixed lots of phpdoc typos 2015-09-02 00:42:15 +01:00
Graham Campbell
c08c099c56 Fixed invalid param phpdoc 2015-09-02 00:41:38 +01:00
Graham Campbell
cd0e10cf9d Fixed lots of phpdoc typos 2015-09-02 00:37:54 +01:00
Graham Campbell
5890f3da98 Fixed invalid param phpdoc 2015-09-02 00:22:30 +01:00
Graham Campbell
429f08a4f4 Test on php 5.5.9 too 2015-09-01 23:12:58 +01:00
Cameron Eagans
2939322826 Remove duplicate allow_failures section 2015-09-01 15:08:20 -04:00
Cameron Eagans
465d1d975c Test on PHP 7 & allow failures 2015-09-01 15:02:58 -04:00
Cameron Eagans
8a5dc21835 Coding standards fix 2015-09-01 15:00:57 -04:00
Cameron Eagans
bbbfc1795d Switch from EngineException to Error 2015-09-01 14:56:06 -04:00
Cameron Eagans
08025c134d Remove string assignment 2015-09-01 14:53:45 -04:00
Cameron Eagans
5a5edc7798 Use random_bytes() when appropriate. 2015-09-01 14:49:32 -04:00
Cameron Eagans
2b75c37cc9 Convert most instances of function_exists() to extension_loaded() where applicable 2015-09-01 14:32:22 -04:00
Cameron Eagans
78bac871af Remove conditions for PHP < 5.3.0 for this branch 2015-09-01 14:22:22 -04:00
Cameron Eagans
df6b201ab9 Switch to extension_loaded('gmp') 2015-09-01 14:22:17 -04:00
Cameron Eagans
a84699a346 Switch to extension_loaded instead of function_exists where it makes sense 2015-09-01 14:22:12 -04:00
terrafrost
abbee318cc X509: updates to getOID() as suggested by bantu 2015-08-31 15:20:38 -05:00
terrafrost
d7d9d782b0 X509: add getOID() method 2015-08-29 22:15:04 -05:00
Andreas Fischer
0f1d043428 Merge branch '1.0' into 2.0 
* 1.0:
  Tests/X509: add unit test showing need for return by reference
 2015-08-24 14:02:39 +02:00
Andreas Fischer
e391fdbd27 Merge pull request #772 from terrafrost/x509_unit_test 
Tests/X509: add unit test showing need for return by reference

* terrafrost/x509_unit_test:
  Tests/X509: add unit test showing need for return by reference
 2015-08-24 14:01:41 +02:00
Andreas Fischer
90a4007a93 Merge branch '1.0' into 2.0 
* 1.0:
  .travis.yml: Remove outdated comment about .scrutinizer.yml
 2015-08-18 11:40:57 -04:00
Andreas Fischer
f7f93961a5 Merge pull request #780 from bantu/scrutinizer-comment-removal-travis-yml 
.travis.yml: Remove outdated comment about .scrutinizer.yml

* bantu/scrutinizer-comment-removal-travis-yml:
  .travis.yml: Remove outdated comment about .scrutinizer.yml
 2015-08-18 11:40:56 -04:00
Andreas Fischer
de896a7169 .travis.yml: Remove outdated comment about .scrutinizer.yml 2015-08-18 00:36:36 -04:00
Andreas Fischer
93ab241c83 Merge pull request #779 from bantu/runkit-absolute-include 
Make paths to runkit_import() absolute due to lack of include path.

* bantu/runkit-absolute-include:
  Make paths to runkit_import() absolute due to lack of include path.
 2015-08-18 00:19:44 -04:00
Andreas Fischer
af939f9aa5 Make paths to runkit_import() absolute due to lack of include path. 2015-08-18 00:00:47 -04:00
Andreas Fischer
2b36d44ded Merge pull request #773 from bantu/include-biginteger-testcase 
Remove include statement from BigInteger TestCase.

* bantu/include-biginteger-testcase:
  Remove include statement from BigInteger TestCase.
 2015-08-17 10:09:00 -04:00
Andreas Fischer
785b37b505 Remove include statement from BigInteger TestCase. 
This was previously required to load MATH_BIGINTEGER_MODE_* constants, but
these are autoloadable via \phpseclib\Math\BigInteger::MODE_* now and the
include path was removed.
 2015-08-13 15:12:20 -04:00
Andreas Fischer
54a1aeeefe Merge branch '1.0' into 2.0 
* 1.0:
  Tests/RSA: add PSS test
  RSA: fix regression for PSS signatures
 2015-08-13 14:37:15 -04:00
Andreas Fischer
fe8fc0701b Merge pull request #769 from terrafrost/pss-fix 
RSA: fix regression for PSS signatures

* terrafrost/pss-fix:
  Tests/RSA: add PSS test
  RSA: fix regression for PSS signatures
 2015-08-13 14:34:43 -04:00
Andreas Fischer
f29805e394 Merge pull request #759 from bantu/ssh2-function-key_exchange-no-static 
[2.0] SSH2: Remove all static variables as loadable classes may change at runtime.

* bantu/ssh2-function-key_exchange-no-static:
  SSH2: Remove all static variables as loadable classes may change at runtime.
 2015-08-13 14:25:21 -04:00
terrafrost
a56e0daf07 Tests/X509: add unit test showing need for return by reference 2015-08-13 10:22:01 -05:00
terrafrost
f591962fc4 Tests/RSA: add PSS test 2015-08-11 11:47:19 -05:00
terrafrost
15c9f99721 RSA: fix regression for PSS signatures 2015-08-11 07:27:56 -05:00
Andreas Fischer
218164d561 Merge pull request #765 from bantu/composer-rm-include-path 
composer: Remove include path. No longer necessary due to PSR4 autoloading

* bantu/composer-rm-include-path:
  composer: Remove include path. No longer necessary due to PSR4 autoloading.
 2015-08-10 12:46:52 +02: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