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
1,626 Commits 4 Branches 121 Tags 19 MiB
a711bacbf8
Commit Graph

1626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
a711bacbf8 Merge branch '2.0' 
* 2.0:
  Tests/X509: swap expected and actual value
  Tests/X509: fix unit test
  Tests/X509: add unit test for unsupported extension encoding
  X509: always base64-encode extensions for which _getMapping returns a bool
 2015-03-05 15:37:58 +01:00
Andreas Fischer
63ed03b119 Merge branch '1.0' into 2.0 
* 1.0:
  Tests/X509: swap expected and actual value
  Tests/X509: fix unit test
  Tests/X509: add unit test for unsupported extension encoding
  X509: always base64-encode extensions for which _getMapping returns a bool
 2015-03-05 15:37:46 +01:00
Andreas Fischer
528d581c73 Merge pull request #629 from terrafrost/x509-unsupported-extensions-2 
X509: always base64-encode extensions for which _getMapping returns a bool

* terrafrost/x509-unsupported-extensions-2:
  Tests/X509: swap expected and actual value
  Tests/X509: fix unit test
  Tests/X509: add unit test for unsupported extension encoding
  X509: always base64-encode extensions for which _getMapping returns a bool
 2015-03-05 15:32:53 +01:00
terrafrost
31e2308ea9 Tests/X509: swap expected and actual value 2015-03-04 23:37:33 -06:00
terrafrost
cc08406a76 Tests/X509: fix unit test 2015-03-04 08:18:54 -06:00
terrafrost
3e1aa8c213 Tests/X509: add unit test for unsupported extension encoding 2015-03-04 08:03:02 -06:00
terrafrost
e686c095b6 X509: always base64-encode extensions for which _getMapping returns a bool 2015-03-01 12:05:49 -06:00
Andreas Fischer
2c96af214b Merge branch '2.0' 
* 2.0:
  CHANGELOG: add clarification
  CHANGELOG: add 0.3.10 release
 2015-02-22 17:23:32 +01:00
Andreas Fischer
9c3ad202c0 Merge branch '1.0' into 2.0 
* 1.0:
  CHANGELOG: add clarification
  CHANGELOG: add 0.3.10 release
 2015-02-22 17:23:32 +01:00
Andreas Fischer
043e567fce Merge pull request #624 from terrafrost/changelog-0.3.10 
CHANGELOG: add 0.3.10 release

* terrafrost/changelog-0.3.10:
  CHANGELOG: add clarification
  CHANGELOG: add 0.3.10 release
 2015-02-22 17:23:31 +01:00
terrafrost
fd613e49cf CHANGELOG: add clarification 2015-02-09 07:56:10 -06:00
Andreas Fischer
3dd18dda0b Merge branch '2.0' 
* 2.0:
  PHP 5.2 is not supported by travis anymore
  Updated dependencies
  Removed old branch alias
 2015-02-08 16:59:22 +01: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
Andreas Fischer
c8fe3c3b30 Merge pull request #620 from GrahamForks/1.0-composer 
Remove old branch alias from 1.0 branch

* GrahamForks/1.0-composer:
  PHP 5.2 is not supported by travis anymore
  Updated dependencies
  Removed old branch alias
 2015-02-08 16:54:12 +01:00
terrafrost
05f4ec133c CHANGELOG: add 0.3.10 release 2015-02-08 09:31:31 -06:00
Graham Campbell
e69cddae7d PHP 5.2 is not supported by travis anymore 2015-02-07 15:44:23 +00:00
Graham Campbell
dea916189f Updated dependencies 2015-02-07 15:35:42 +00:00
Graham Campbell
790463cbc7 Removed old branch alias 2015-02-07 15:35:37 +00:00
terrafrost
87a4863304 Merge branch '2.0' 2015-02-05 07:51:08 -06:00
terrafrost
becb9524ff Merge branch '1.0' into 2.0 2015-02-05 07:50:55 -06:00
terrafrost
c047e69d3e README: update download link to latest version 2015-02-05 07:50:26 -06:00
Andreas Fischer
8c2ba4c153 Merge branch '2.0' 
* 2.0:
  Adjust sami.conf.php to new branch names.
 2015-02-04 18:16:50 +01:00
Andreas Fischer
eca3bb9724 Merge branch '1.0' into 2.0 
* 1.0:
  Adjust sami.conf.php to new branch names.
 2015-02-04 18:16:50 +01:00
Andreas Fischer
7a6369ca24 Merge pull request #616 from bantu/sami-branches 
Adjust sami.conf.php to new branch names.

* bantu/sami-branches:
  Adjust sami.conf.php to new branch names.
 2015-02-04 18:16:50 +01:00
terrafrost
755db3a72f README: change download link to 0.3.10 
doing this from the github.com GUI - not from a CLI git install...
 2015-02-04 10:29:59 -06:00
Andreas Fischer
51580c0cb7 Adjust sami.conf.php to new branch names. 2015-02-04 16:53:39 +01:00
Andreas Fischer
257d44331e Merge branch 'master' into php5 
* master:
  .scrutinizer.yml: Use large timeout to prevent coverage receiver from timing out.
  Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below).
 2015-01-28 23:03:31 +01:00
Andreas Fischer
d15bba1edc Merge pull request #315 from bantu/php5.3.3-ssh-functional-tests-reenable 
Reenable SSH Functional Test on Travis CI PHP 5.3.3 and below.

* bantu/php5.3.3-ssh-functional-tests-reenable:
  Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below).
 2015-01-28 22:50:33 +01:00
Andreas Fischer
dab7380fa3 Merge pull request #611 from bantu/drop-psr0 
composer.json: Remove PSR-0 autoload statements.

* bantu/drop-psr0:
  composer.json: Remove PSR0 autoload statements.
 2015-01-28 16:23:44 +01:00
Andreas Fischer
d8742488f6 Merge pull request #612 from bantu/scrutinizer-timeout 
.scrutinizer.yml: Use large timeout to prevent coverage receiver from ti...

* bantu/scrutinizer-timeout:
  .scrutinizer.yml: Use large timeout to prevent coverage receiver from timing out.
 2015-01-28 16:21:58 +01:00
Andreas Fischer
c9c68c9ca2 .scrutinizer.yml: Use large timeout to prevent coverage receiver from timing out. 2015-01-28 14:36:11 +01:00
Andreas Fischer
3f7dc96a2b composer.json: Remove PSR0 autoload statements. 2015-01-28 13:52:42 +01:00
Andreas Fischer
f908040d20 Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below). 2015-01-28 13:37:21 +01:00
Andreas Fischer
9abd251cb2 Merge pull request #590 from cnelissen/MarkBaseAbstract 
Mark Base as abstract

* cnelissen/MarkBaseAbstract:
  Marked Base as abstract
 2015-01-17 14:14:46 +01:00
Andreas Fischer
38e6196127 Merge branch 'master' into php5 
* master:
  ASN1: empty constructed context-specific tags error'd out

Conflicts:
	phpseclib/File/ASN1.php
 2015-01-11 16:09:50 +01:00
Andreas Fischer
fd6aa5258c Merge pull request #606 from terrafrost/asn-csr-2 
ASN1 / CSR fixes

* terrafrost/asn-csr-2:
  ASN1: empty constructed context-specific tags error'd out
 2015-01-11 16:05:19 +01:00
terrafrost
84325d415e ASN1: empty constructed context-specific tags error'd out 
eg. an attributes field in a CSR that's blank
 2015-01-10 23:58:50 -06:00
Andreas Fischer
04dad3ff8c Merge branch 'master' into php5 
* master:
  Compare numeric part of OpenSSL version
 2015-01-09 13:09:21 +01:00
Andreas Fischer
09ccfdbcb9 Merge pull request #598 from haphan/master 
(OpenSSL Big integer) Only require major version to match

* haphan/master:
  Compare numeric part of OpenSSL version
 2015-01-09 13:08:59 +01:00
Ha Phan
b0129e9125 Compare numeric part of OpenSSL version 2015-01-08 20:55:14 +07:00
Andreas Fischer
d6037e5e87 Merge pull request #599 from bantu/php-5.3.3 
Require PHP 5.3.3 since that is the lowest version we are running tests ...

* bantu/php-5.3.3:
  Require PHP 5.3.3 since that is the lowest version we are running tests on.
 2015-01-06 21:15:12 +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
Clint Nelissen
71c2d43956 Marked Base as abstract 2015-01-05 08:42:30 -08:00
Andreas Fischer
520fdcdd29 Merge pull request #596 from bantu/disconnect-fix-php5 
SSH2: update conditions under which _disconnect's code is executed

* bantu/disconnect-fix-php5:
  NET_SSH2_ -> self::
 2015-01-04 11:58:39 +01:00
Andreas Fischer
b8159ee2fb Merge branch 'master' into php5 
* master:
  SSH2: update conditions under which _disconnect's code is executed
 2015-01-04 11:58:12 +01:00
Andreas Fischer
3c99773184 Merge pull request #588 from terrafrost/disconnect-fix 
SSH2: update conditions under which _disconnect's code is executed

* terrafrost/disconnect-fix:
  SSH2: update conditions under which _disconnect's code is executed
 2015-01-04 11:57:52 +01:00
Andreas Fischer
1c923576c6 NET_SSH2_ -> self:: 2015-01-04 11:38:03 +01:00
Andreas Fischer
ec21aa23f1 Merge pull request #588 from terrafrost/disconnect-fix 
SSH2: update conditions under which _disconnect's code is executed

* terrafrost/disconnect-fix:
  SSH2: update conditions under which _disconnect's code is executed
 2015-01-04 11:36:14 +01:00
Andreas Fischer
8fae19a024 Merge pull request #581 from cnelissen/ReplaceGetClassFix 
Replaced get_class() calls with instanceof operators

* cnelissen/ReplaceGetClassFix:
  Revert changes for abstract methods in Base class
  Replaced get_class() calls with instanceof operators
 2015-01-03 17:22:39 +01:00
Clint Nelissen
d4f04bcab1 Revert changes for abstract methods in Base class 2014-12-29 08:54:45 -08:00