Commit Graph

1014 Commits

Author SHA1 Message Date
Andreas Fischer
cdda621903 Merge pull request #714 from bantu/diffie-hellman-group-exchange-sha256
Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256}

* bantu/diffie-hellman-group-exchange-sha256:
  Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256}
2015-07-08 15:43:46 +02:00
Andreas Fischer
abeda5237f Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256} 2015-07-08 00:00:40 +02:00
Andreas Fischer
7f1dfba50d Merge pull request #730 from terrafrost/disable-stat-cache-1.0
SFTP: don't update stat cache when it's been disabled

* terrafrost/disable-stat-cache-1.0:
  SFTP: don't update stat cache when it's been disabled
2015-07-06 23:48:28 +02:00
Andreas Fischer
643103449c Merge pull request #731 from terrafrost/sftp-recur-delete-stat-cache-1.0
SFTP: delete stat cache for recursive deletes / 1.0 branch

* terrafrost/sftp-recur-delete-stat-cache-1.0:
  SFTP: update how recursive delete's update stat cache
  Tests/SFTP: add unit test
2015-07-06 23:37:55 +02:00
terrafrost
c460e511a0 SFTP: update how recursive delete's update stat cache 2015-07-04 13:09:26 -05:00
terrafrost
109ae38e48 SFTP: don't update stat cache when it's been disabled 2015-07-04 12:19:35 -05:00
Andreas Fischer
727677d4e1 Merge pull request #713 from bantu/SFTPStreamTest
[1.0] Various fixes to fopen mode handling in SFTP Stream

* bantu/SFTPStreamTest:
  Explicitly set size to 0 when creating or truncating.
  mode[0] of 'c' is not supposed to truncate.
  Need to create the file when it does not exist and mode[0] is not 'r'.
  Add SFTPStreamTest::testFopenFcloseCreatesFile()
2015-07-04 14:28:06 +02:00
terrafrost
77c757d095 X509: set one more parameter to null 2015-06-29 22:10:18 -05:00
terrafrost
6c2798be90 X509: set another parameters field to null 2015-06-29 21:53:27 -05:00
terrafrost
46a3c0fbbb X509: set parameter field to null for RSA keys 2015-06-28 11:32:42 -05:00
Andreas Fischer
1ad66ad1ea Merge pull request #719 from terrafrost/lstat-fix-1.0
SFTP: update conditions under which cache for lstat / . is used for 1.0 branch

* terrafrost/lstat-fix-1.0:
  Tests/SFTP: $lstat->$stat
  Tests/SFTP: just check to see that stat / lstat return an array
  SFTP: update conditions under which cache for lstat / . is used
  Tests/SFTP: add test for stat's on .
2015-06-27 21:59:45 +02:00
terrafrost
d1d415618a SFTP: update conditions under which cache for lstat / . is used 2015-06-26 23:34:14 -05:00
Andreas Fischer
d71da6b02b Explicitly set size to 0 when creating or truncating. 2015-06-25 14:26:35 +02:00
Andreas Fischer
9e07fb704b mode[0] of 'c' is not supposed to truncate. 2015-06-25 14:24:58 +02:00
Andreas Fischer
f0957021a1 Need to create the file when it does not exist and mode[0] is not 'r'. 2015-06-25 14:24:18 +02:00
terrafrost
c0555581e7 SSH2: fix for window sizes > 2,147,483,648 2015-06-24 23:45:14 -05:00
terrafrost
6bc3513914 SFTP: stat cache updates 2015-06-20 19:33:19 -05:00
Andreas Fischer
a79b4ac6ad Merge pull request #699 from terrafrost/asn1-fix-1.0
ASN1 parsing fix for issue mainly effecting CSR's for 1.0 branch

* terrafrost/asn1-fix-1.0:
  ASN1: handle malformed input better
  Tests/X509/CSR: add unit test for ASN1 changes
  ASN1: constructed context-specific tags can have x sub elements
2015-06-16 16:30:35 +02:00
Andreas Fischer
956607d4e0 Merge pull request #692 from terrafrost/rsa-none-1.0
add "none" encryption mode for 1.0 branch

* terrafrost/rsa-none-1.0:
  Tests/RSA: pack expected result
  Tests/RSA: re-added accidentally removed $rsa initialization
  Tests/RSA: fix error
  Tests/RSA: hard-coded key and result
  RSA: add "none" encryption mode
2015-06-09 17:18:47 +02:00
terrafrost
11000a93b9 ASN1: handle malformed input better 2015-06-07 09:59:13 -05:00
terrafrost
d3a5398fe4 ASN1: constructed context-specific tags can have x sub elements
previously it only worked for when there was one sub element.
2015-06-03 23:48:43 -05:00
terrafrost
1d924cfc7b RSA: add "none" encryption mode 2015-05-25 22:30:38 -05:00
terrafrost
48191bdeec ANSI: fix typo 2015-05-23 17:39:17 -05:00
terrafrost
2bb70a1c22 ANSI: rendering improvements 2015-05-23 16:51:57 -05:00
terrafrost
cc0420b36b ANSI: improve vt100 terminal emulation
store each coordinate's attributes independently and add support
for a few more escape codes
2015-05-23 11:55:03 -05:00
terrafrost
2fee2d4f98 backport e3betht's PR to 1.0 2015-05-07 00:26:39 -05:00
terrafrost
f19bf7a07d RSA: backport getPublicKeyFingerprint from Lukas-W's PR 2015-05-06 22:55:12 -05:00
Andreas Fischer
5bd7a73a71 Merge pull request #674 from terrafrost/ssh2-global-request
fix E_NOTICE with SSH2 global requests

* terrafrost/ssh2-global-request:
  SSH2: string shift by 4 instead of by 1
  SSH2: fix E_NOTICE involving global requests
2015-05-05 16:14:12 +02:00
terrafrost
684d6eed0e SSH2: string shift by 4 instead of by 1 2015-05-04 08:22:27 -05:00
Andreas Fischer
5d2590feb0 Replace ; with : in case statement. 2015-05-03 13:18:23 +02:00
andrey012
e7719f765c callbacks - two PRs conflict sorted out.
First one: e9b698fd65, fba6894474, 1cd286642e
Second one: 16430d4d2e, 0cc6125f87
2015-05-02 15:27:57 +03:00
andrey012
f4a93c790f Merge branch '1.0' into sftp-put-callback-for-1.0 2015-05-02 15:24:31 +03:00
andrey012
0cc6125f87 documentation fix 2015-05-02 14:28:19 +03:00
terrafrost
b59d821bbe SSH2: fix E_NOTICE involving global requests 2015-04-30 21:34:07 -05:00
terrafrost
1d772c3a6f Merge remote-tracking branch 'audrey/sftp-put-callback-for-1.0' into 1.0 2015-04-16 07:45:24 -05:00
terrafrost
9f626c67b6 Merge remote-tracking branch 'graham/1.0-phpdoc' into 1.0-phpdoc 2015-04-16 00:31:54 -05:00
terrafrost
b47813cf47 Merge remote-tracking branch 'DavidAnderson84/patch-4' into 1.0 2015-04-15 23:52:00 -05:00
andrey012
16430d4d2e support for callback function for SFTP::put function - in order to pipe data directly to remote server without putting it into file or keeping in memory. This can be useful particularly for dumping big databases directly to remote server. 2015-04-15 03:29:01 +03:00
terrafrost
f5f714b197 Merge branch 'openssl-support' of https://github.com/terrafrost/phpseclib into openssl-support 2015-04-02 07:05:10 -05:00
terrafrost
adad5fa157 Crypt/*: update some docblock comments 2015-04-02 07:04:02 -05:00
terrafrost
87e0f05ada Merge branch 'openssl-support' of https://github.com/terrafrost/phpseclib into openssl-support 2015-04-02 05:58:58 -05:00
terrafrost
e510dc878b Merge branch '1.0' of https://github.com/phpseclib/phpseclib into openssl-support
Conflicts:
	phpseclib/Net/SSH2.php
2015-04-02 05:40:14 -05:00
terrafrost
e9fe245132 Crypt/Base: update some comments 2015-03-30 23:43:28 -05:00
terrafrost
1a51226d84 Crypt/Base; prioritize OpenSSL over mcrypt 2015-03-30 23:33:52 -05: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
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
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