octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-16 10:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,600 Commits 4 Branches 121 Tags 20 MiB
257d44331e
Commit Graph

1600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
terrafrost
472e006b6c SSH2: update conditions under which _disconnect's code is executed 2014-12-29 08:37:44 -06:00
Andreas Fischer
f2134aa4b2 Merge branch 'master' into php5 
* master:
  "@access static" isn't a thing
 2014-12-27 20:25:04 +01:00
Andreas Fischer
c3a8f98dcb Merge pull request #586 from GrahamForks/access-fix 
"@access static" isn't a thing

* GrahamForks/access-fix:
  "@access static" isn't a thing
 2014-12-27 20:24:27 +01:00
Graham Campbell
bd0537fec5 "@access static" isn't a thing 2014-12-27 15:38:14 +00:00
Andreas Fischer
6205531907 Merge branch 'master' into php5 
* master:
  Fix undefined $raw error
 2014-12-26 10:48:16 +01:00
Andreas Fischer
471cb1dfb0 Merge pull request #583 from bantu/SSH1UndefinedVariableFix 
Fix undefined $raw error

* bantu/SSH1UndefinedVariableFix:
  Fix undefined $raw error
 2014-12-26 10:47:51 +01:00
Clint Nelissen
01d7c96a11 Fix undefined $raw error 2014-12-26 10:37:46 +01:00
Clint Nelissen
f3565346fa Replaced get_class() calls with instanceof operators 2014-12-24 13:07:14 -08:00
Andreas Fischer
a272b58322 Merge pull request #551 from bantu/2.0-code-sniffer 
Code Sniffer rules witnessing PSR-4 and related goals

* bantu/2.0-code-sniffer:
  Remove side-effects from test files.
  Do not require test classes to be namespaced.
  Add code sniffer rules for 2.0 goals.
 2014-12-17 05:03:45 +01:00
Andreas Fischer
ffb2fcab80 Remove side-effects from test files. 2014-12-17 04:50:18 +01:00
Andreas Fischer
218f151693 Do not require test classes to be namespaced. 2014-12-17 04:06:36 +01:00
Andreas Fischer
b5227ddb67 Add code sniffer rules for 2.0 goals. 2014-12-17 04:06:36 +01:00
Andreas Fischer
96172d4ac5 Merge pull request #569 from cnelissen/NamespaceCryptPackage 
Namespaced Crypt Package (Final)

* cnelissen/NamespaceCryptPackage:
  Namespaced Crypt Package
 2014-12-17 02:54:30 +01:00
Clint Nelissen
fe742e18d7 Namespaced Crypt Package 2014-12-16 16:16:54 -08:00
Andreas Fischer
6c1695c9a2 Merge pull request #555 from cnelissen/NamespaceNetPackage 
Namespace net package

* cnelissen/NamespaceNetPackage:
  Rebased
  Temporary constant fix
  Updated unit tests
  Namespaced classes
 2014-12-16 00:05:09 +01:00
Clint Nelissen
c1f647c77d Rebased 2014-12-15 14:33:25 -08:00
Clint Nelissen
dfb8d52806 Temporary constant fix 2014-12-15 14:29:34 -08:00
Clint Nelissen
794fcb7ee8 Updated unit tests 2014-12-15 14:29:34 -08:00
Clint Nelissen
628949fb73 Namespaced classes 2014-12-15 14:29:20 -08:00
Andreas Fischer
2871cce58d Merge pull request #567 from cnelissen/NamespaceSystemPackage 
Namespace system package #2

* cnelissen/NamespaceSystemPackage:
  Namespaced classes
 2014-12-15 23:17:09 +01:00
Clint Nelissen
fddf20f89c Namespaced classes 2014-12-15 09:25:46 -08:00
Andreas Fischer
16503848a4 Merge branch 'master' into php5 
* master:
  Run HHVM tests in parallel.
 2014-12-14 01:51:44 +01:00
Andreas Fischer
eefcb55138 Merge pull request #565 from bantu/hhvm-parallel 
Run HHVM tests in parallel.

* bantu/hhvm-parallel:
  Run HHVM tests in parallel.
 2014-12-14 01:51:38 +01:00
Andreas Fischer
10050c1748 Run HHVM tests in parallel. 2014-12-14 01:27:57 +01:00
Andreas Fischer
768ac083dc Merge pull request #564 from bantu/engine-back-to-mode 
Use _MODE instead of the incorrect _ENGINE.

* bantu/engine-back-to-mode:
  Use _MODE instead of the incorrect _ENGINE.
 2014-12-12 22:22:39 +01:00
Andreas Fischer
30ef0e164f Merge branch 'master' into php5 
* master:
  Properly skip SFTPLargeFileTest when environment variables not defined.
 2014-12-12 22:22:23 +01:00