Commit Graph

2097 Commits

Author SHA1 Message Date
Cameron Eagans
08025c134d Remove string assignment 2015-09-01 14:53:45 -04:00
Dmitry Balabka
70dd67c4d9 Connection reuse refactoring to rid of globals 2015-09-01 21:50:30 +03:00
Cameron Eagans
5a5edc7798 Use random_bytes() when appropriate. 2015-09-01 14:49:32 -04:00
Andreas Fischer
09769f60fb Merge pull request #739 from terrafrost/exceptions-v1
Exception support

* terrafrost/exceptions-v1:
  Exceptions: CS adjustment
  SSH/Agent/Identity: replace user_error's with exceptions
  SSH2: missed a few user_error's
  SCP: replace user_error's with exceptions
  SSH/Agent: replace user_error's with exceptions
  SFTP: replace user_error's with exceptions
  RSA: some of the exceptions being thrown weren't valid
  SSH2: replace user_error's with exceptions
  ASN1/X509: throw exceptions instead of user_errors
  rm unused exception
  RSA: replace user_error's with Exceptions
  Random: replace user_error with exception
  Crypt/Base: use the built-in spl exceptions instead
  Exceptions: more CS adjustments
  Exceptions: CS adjustment
  Crypt/Base: add initial exception support
2015-09-01 20:45:53 +02: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
c27f70c577 Exceptions: CS adjustment 2015-08-31 23:54:35 -05:00
terrafrost
2a8da097ae Merge branch 'master' into exceptions-v1
Conflicts:
	phpseclib/Net/SSH2.php
2015-08-31 23:47:12 -05:00
terrafrost
e399a320dc SSH/Agent/Identity: replace user_error's with exceptions 2015-08-31 23:36:56 -05:00
terrafrost
724ba7ccc9 SSH2: missed a few user_error's 2015-08-31 23:34:33 -05:00
terrafrost
a6fd9ea8b6 SCP: replace user_error's with exceptions 2015-08-31 23:28:20 -05:00
terrafrost
2eb4ebf11c SSH/Agent: replace user_error's with exceptions 2015-08-31 23:23:40 -05:00
terrafrost
2e46aec03a SFTP: replace user_error's with exceptions 2015-08-31 23:12:33 -05:00
terrafrost
453e6fcf18 RSA: some of the exceptions being thrown weren't valid 2015-08-31 22:44:41 -05: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
815fd47162 Merge branch '2.0'
* 2.0:
  Tests/X509: add unit test showing need for return by reference
2015-08-24 14:02:45 +02: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
fbdb687000 Merge pull request #781 from bantu/travis-php-7.0
Add PHP7 to Travis CI.

* bantu/travis-php-7.0:
  Add PHP7 to Travis CI.
2015-08-22 21:20:32 +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
bc1b7c4c06 Merge branch '2.0'
* 2.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
2813e2cd3b Add PHP7 to Travis CI. 2015-08-18 00:43:16 -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
179be1e518 Merge branch '2.0'
* 2.0:
  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
05d5f95e4b Merge branch '2.0'
* 2.0:
  Remove include statement from BigInteger TestCase.
2015-08-17 10:09:01 -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
835b955273 Merge branch '2.0'
* 2.0:
  Tests/RSA: add PSS test
  RSA: fix regression for PSS signatures
2015-08-13 14:38:10 -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
7da4f2e630 Merge branch '2.0'
* 2.0:
  SSH2: Remove all static variables as loadable classes may change at runtime.
2015-08-13 14:25:21 -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
78a6a7e847 Merge branch '2.0'
* 2.0:
  composer: Remove include path. No longer necessary due to PSR4 autoloading.
2015-08-10 12:46:53 +02: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
bccb7db1e6 Merge branch '2.0' 2015-08-04 07:16:18 -05:00
terrafrost
761173bb7f composer.json: rm pear-pear/PHP_Compat 2015-08-04 07:15:35 -05:00
terrafrost
580aba3988 Merge branch '2.0' 2015-08-03 23:48:36 -05:00
terrafrost
a74aa9efbe composer.json: rm bom 2015-08-03 23:48:03 -05:00
terrafrost
10e11795df Merge branch 'master' of https://github.com/phpseclib/phpseclib 2015-08-03 23:26:24 -05:00
terrafrost
4c96d56303 Merge branch '2.0' 2015-08-03 23:25:28 -05:00