octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-18 03:05:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,268 Commits 4 Branches 121 Tags 20 MiB
232880b0d9
Commit Graph

2268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
19d93fe76c Merge branch '2.0' 
* 2.0:
  X509: updates to getOID() as suggested by bantu
  X509: add getOID() method
 2015-09-02 15:06:40 +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
6433a10fa5 Merge pull request #787 from torinaki/remove-global-and-earn-25$ 
Connection reuse refactoring to rid of globals

* torinaki/remove-global-and-earn-25$:
  Connection reuse refactoring to rid of globals
 2015-09-02 15:04:52 +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
Andreas Fischer
3194cbdc17 Merge branch '2.0' 
* 2.0:
  Test on php 5.5.9 too
 2015-09-02 14:52:44 +02:00
Graham Campbell
7cd45e5e1b Fixed lots of phpdoc typos 2015-09-02 00:44:55 +01:00
Graham Campbell
2be0506514 Fixed invalid param phpdoc 2015-09-02 00:44:39 +01: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
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