Commit Graph

1344 Commits

Author SHA1 Message Date
Andreas Fischer
6dc32808f1 Merge pull request #644 from terrafrost/agentforwarding-1.0
Agent Forwarding for 1.0 branch

* terrafrost/agentforwarding-1.0:
  removed unwarrented user_error
  preference isset over array_key_exists, return false on failure, break after return channel opened
  moved agent forwarding channel handling to filter method and reusing existing open channels to request forwarding
  removed stopSSHForwarding
  determining what failure to expect
  addresses low hanging fruit comments from terrafrost and bantu
  removed superfluous default case
  SSH agent forwarding implementation
2015-03-30 12:22:57 +02:00
terrafrost
bb01002233 Merge remote-tracking branch 'agentforwarding/feature/ssh_agent_forwarding' into agentforwarding-1.0 2015-03-28 21:03:17 -05:00
montdidier
3ff4212b92 removed unwarrented user_error 2015-03-24 13:40:42 +08:00
montdidier
9723acc885 preference isset over array_key_exists, return false on failure, break after return channel opened 2015-03-24 13:38:56 +08:00
Andreas Fischer
f960410b77 Merge pull request #627 from terrafrost/x509-custom-extensions
X509: make it so you can use File_ASN1_Element for custom X.509 extensions

* terrafrost/x509-custom-extensions:
  Tests/X509: add unit test
  X509: make it so you can use File_ASN1_Element for custom X.509 extensions
2015-03-10 13:43:11 +01:00
terrafrost
dad8a9ef37 Tests/X509: add unit test 2015-03-10 01:39:13 -05:00
terrafrost
7ac2470c98 Merge branch '1.0' of https://github.com/phpseclib/phpseclib into x509-custom-extensions 2015-03-09 01:38:33 -05: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
terrafrost
7e2dd90140 X509: make it so you can use File_ASN1_Element for custom X.509 extensions 2015-03-01 11:57:36 -06: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
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
montdidier
1803bcac0b moved agent forwarding channel handling to filter method and reusing existing open channels to request forwarding 2015-02-06 11:28:23 +08:00
terrafrost
c047e69d3e README: update download link to latest version 2015-02-05 07:50:26 -06:00
montdidier
25b328c440 removed stopSSHForwarding 2015-02-05 13:19:57 +08: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
Andreas Fischer
51580c0cb7 Adjust sami.conf.php to new branch names. 2015-02-04 16:53:39 +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
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
f908040d20 Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below). 2015-01-28 13:37:21 +01:00
montdidier
8571d0c6d7 determining what failure to expect 2015-01-13 09:52:01 +08:00
montdidier
1ebba5b32c Merge branch 'feature/ssh_agent_forwarding' of github.com:KrugerHeavyIndustries/phpseclib into feature/ssh_agent_forwarding 2015-01-12 17:14:14 +08:00
montdidier
dd0b3e6bd5 addresses low hanging fruit comments from terrafrost and bantu 2015-01-12 17:13:33 +08: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
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
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
Chris Kruger
8dad92f5e5 removed superfluous default case 2014-12-30 16:40:47 +08:00
montdidier
aca4ba3286 SSH agent forwarding implementation 2014-12-30 10:44:31 +08:00
terrafrost
472e006b6c SSH2: update conditions under which _disconnect's code is executed 2014-12-29 08:37:44 -06: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
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
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
956660e9b9 Merge pull request #562 from bantu/properly-skip-SFTPLargeFileTest
Properly skip SFTPLargeFileTest when environment variables not defined.

* bantu/properly-skip-SFTPLargeFileTest:
  Properly skip SFTPLargeFileTest when environment variables not defined.
2014-12-12 22:22:07 +01:00
Andreas Fischer
93213ccc70 Merge pull request #563 from bantu/code-sniffer-1.5.6
Update Code Sniffer to version 1.5.6

* bantu/code-sniffer-1.5.6:
  Update Code Sniffer to version 1.5.6
2014-12-12 22:21:13 +01:00
Clint Nelissen
0547d182fc Update Code Sniffer to version 1.5.6 2014-12-12 19:44:25 +01:00
Andreas Fischer
f1865af505 Properly skip SFTPLargeFileTest when environment variables not defined. 2014-12-12 19:38:04 +01:00