Commit Graph

1904 Commits

Author SHA1 Message Date
terrafrost
1a51226d84 Crypt/Base; prioritize OpenSSL over mcrypt 2015-03-30 23:33:52 -05:00
Andreas Fischer
41f2660136 Merge branch '2.0'
* 2.0:
  SSH2: rm unused $connectionTimeout variable
  SSH2: rm redundant code and make php4 compatable
  SSH2: timeout improvements
2015-03-30 12:47:10 +02:00
Andreas Fischer
8101772ab4 Merge branch '1.0' into 2.0
* 1.0:
  SSH2: rm unused $connectionTimeout variable
  SSH2: rm redundant code and make php4 compatable
  SSH2: timeout improvements

Conflicts:
	phpseclib/Net/SSH2.php
2015-03-30 12:46:54 +02:00
Andreas Fischer
c0370ee91d Merge pull request #639 from terrafrost/banner-timeout
improve error handling with protocol version exchange

* terrafrost/banner-timeout:
  SSH2: rm unused $connectionTimeout variable
  SSH2: rm redundant code and make php4 compatable
  SSH2: timeout improvements
2015-03-30 12:37:46 +02:00
Andreas Fischer
ca7b542b6f Merge branch '2.0'
* 2.0:
  SSH2: missed a file in the merge
  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:25:19 +02:00
Andreas Fischer
0e17af416c Merge branch '1.0' into 2.0
* 1.0:
2015-03-30 12:23:13 +02:00
Andreas Fischer
28a2f0fc0c Merge pull request #648 from terrafrost/agentforwarding-2.0-1
Agent Forwarding for 2.0 branch

* terrafrost/agentforwarding-2.0-1:
  SSH2: missed a file in the merge
  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:23:10 +02:00
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
6bd4e6018e Crypt/Base: rm redundant null padding 2015-03-29 15:26:15 -05:00
Graham Campbell
e50cbacd4e Fixed some phpdocs 2015-03-29 17:07:17 +01:00
terrafrost
33645f5297 SSH2: missed a file in the merge 2015-03-29 10:58:05 -05:00
terrafrost
a8e702b34f Merge branch 'agentforwarding-1.0' into agentforwarding-2.0
Conflicts:
	phpseclib/Net/SSH2.php
	phpseclib/System/SSH/Agent.php
2015-03-29 10:32:30 -05:00
terrafrost
bb01002233 Merge remote-tracking branch 'agentforwarding/feature/ssh_agent_forwarding' into agentforwarding-1.0 2015-03-28 21:03:17 -05:00
terrafrost
1294b08675 SSH2: rm unused $connectionTimeout variable 2015-03-27 22:32:38 -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
cae37aeef3 Merge pull request #642 from terrafrost/des-self-fix
DES: fix fatal error that could occur under special circumstances

* terrafrost/des-self-fix:
  DES: fix fatal error that could occur under special circumstances
2015-03-21 17:54:27 +01:00
Andreas Fischer
b70ed2e860 Merge branch '2.0'
* 2.0:
  DES: fix fatal error that could occur under special circumstances
2015-03-21 17:54:27 +01:00
terrafrost
4ba8c24c13 DES: fix fatal error that could occur under special circumstances 2015-03-21 11:01:43 -05:00
terrafrost
dfd57dfb89 SSH2: rm redundant code and make php4 compatable 2015-03-19 22:39:43 -05:00
terrafrost
23c65c3839 SSH2: timeout improvements
make it so that the timeout in the constructor behaves in the same
way that timeout's set via setTimeout() do. eg. isTimeout() tells
you if a timeout was thrown etc.
2015-03-19 07:53:19 -05:00
terrafrost
8f81fc8f28 Merge branch '1.0' of https://github.com/phpseclib/phpseclib into openssl-support 2015-03-15 02:45:32 -05:00
terrafrost
9a400c4094 Crypt/Base: engine wasn't being set correctly 2015-03-15 02:44:13 -05:00
Andreas Fischer
f7c0354db2 Merge branch '2.0'
* 2.0:
  Tests/X509: add unit test
  X509: make it so you can use File_ASN1_Element for custom X.509 extensions
2015-03-10 13:46:37 +01:00
Andreas Fischer
f57e01df65 Merge branch '1.0' into 2.0
* 1.0:
  Tests/X509: add unit test
  X509: make it so you can use File_ASN1_Element for custom X.509 extensions
2015-03-10 13:46:15 +01: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
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
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
terrafrost
3f3e0cac98 setengine changes per bantu 2015-02-24 00:05:00 -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
fb5f6cb855 Merge branch '1.0' into openssl-support 2015-02-14 08:08:04 -06:00
terrafrost
9b7d006edb Merge branch '1.0' into openssl-support 2015-02-13 22:35:43 -06: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