terrafrost
a1b749a0a0
Merge branch 'master' into php5
2013-12-27 10:25:19 -06:00
Andreas Fischer
f63798b923
Merge pull request #233 from terrafrost/phar-fix
...
SSH2: better accomodate Phar's
* terrafrost/phar-fix:
SSH2: better accomodate Phar's
2013-12-26 19:43:26 +01:00
Andreas Fischer
0f69d35584
Fix indentation of _append_log in SSH1 and SSH2.
2013-12-26 11:45:24 +01:00
Andreas Fischer
0dd5a9ba9f
Merge pull request #228 from bantu/cs-whitespace
...
CS: Add useful whitespace CodeSniffer rules.
* bantu/cs-whitespace:
CS: Add useful whitespace CodeSniffer rules.
2013-12-26 11:38:17 +01:00
terrafrost
70b9a69c46
SSH2: better accomodate Phar's
2013-12-26 01:55:05 -06:00
Andreas Fischer
8bb80b3df0
CS: Add useful whitespace CodeSniffer rules.
2013-12-26 00:33:08 +01:00
terrafrost
8424a464a6
SSH2: typos in last commit
2013-12-22 18:25:00 -06:00
terrafrost
0f5b3ea416
Compatibility fixes
...
- PHP4 doesn't allow method chaining
- $_SESSION isn't always defined
- on PHP5.1 and earlier using 0x100000000 instead of 4294967296 gives E_NOTICE
- array('Net_SSH2', 'func_name') doesn't work so we fix this by passing $this to it.
to make that work on PHP4 pass by call-time reference. normally this would result
in a fatal error on PHP5.4+ but doesn't seem to in this case. the following URL
elaborates:
http://stackoverflow.com/q/20732563/569976
2013-12-22 18:14:49 -06:00
terrafrost
4bd9a546ab
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-12-22 11:53:35 -06:00
terrafrost
c26594ba08
Merge remote-tracking branch 'upstream/php5' into php5
2013-12-22 11:50:11 -06:00
Andreas Fischer
d311698340
Merge branch 'master' into php5
...
* master:
SSH2: fix E_DEPRECATED on PHP5.5
2013-12-17 20:56:06 +01:00
terrafrost
6ac922726d
SSH2: fix E_DEPRECATED on PHP5.5
2013-12-16 11:27:12 -06:00
terrafrost
c01b8fc4ed
SCP: Tweaks
...
sending the close channel packet right after the eof seems to make some scp transfers terminate prematurely.
unfortunately, sometimes this behavior is undesirable as it is in this case:
http://www.frostjedi.com/phpbb3/viewtopic.php?f=46&t=29457
hence the $want_reply parameter
also, this commit makes the scp packet length account for the length portion
2013-12-15 00:43:20 -06:00
Andreas Fischer
03b08ceaa0
Merge branch 'master' into php5
...
* master:
CS: Fix "PEAR.Commenting.ClassComment.WrongTagOrder" sniff.
2013-12-11 23:30:19 +01:00
Andreas Fischer
f0f029b2c1
CS: Fix "PEAR.Commenting.ClassComment.WrongTagOrder" sniff.
2013-12-11 18:33:18 +01:00
Andreas Fischer
3729ba3e44
Merge branch 'master' into php5
...
* master:
CS: Fix "PEAR.Commenting.FileComment.TagIndent" sniff.
2013-12-10 22:29:11 +01:00
Andreas Fischer
3db1fbb072
CS: Fix "PEAR.Commenting.FileComment.TagIndent" sniff.
2013-12-10 20:10:37 +01:00
Andreas Fischer
452d3dc359
Merge branch 'master' into php5
...
* master:
CS: Fix "PEAR.Files.IncludingFile.UseIncludeOnce" sniff.
2013-12-06 12:20:42 +01:00
Andreas Fischer
6d1fb9f7db
CS: Fix "PEAR.Files.IncludingFile.UseIncludeOnce" sniff.
2013-12-06 01:03:34 +01:00
Andreas Fischer
64691f2aec
Merge branch 'master' into php5
...
* master:
Fix "PEAR.Files.IncludingFile.BracketsNotRequired" sniff.
2013-12-06 00:58:00 +01:00
Andreas Fischer
bc6ff96292
Fix "PEAR.Files.IncludingFile.BracketsNotRequired" sniff.
2013-12-05 23:17:40 +01:00
Andreas Fischer
d696f22b89
Merge pull request #201 from mpscholten/php5-ssh2-microtime
...
Replaced php4 hack for microtime(true) with real microtime(true)
* mpscholten/php5-ssh2-microtime:
Replaced php4 hack for microtime(true) with real microtime(true)
2013-12-05 20:54:11 +01:00
Marc Philip Scholten
d6c70a76d9
Replaced php4 hack for microtime(true) with real microtime(true)
2013-12-05 18:46:46 +01:00
Andreas Fischer
e09f1b730e
CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff.
2013-12-03 19:34:41 +01:00
Andreas Fischer
ca9c8b107b
CodeSniffer: Fix Generic.PHP.LowerCaseConstant.Found sniff.
2013-12-03 18:54:43 +01:00
Andreas Fischer
399308f98a
Merge pull request #180 from mpscholten/removed-vim-comments
...
Removed vim comments
* mpscholten/removed-vim-comments:
Removed vim comments
2013-11-23 21:16:25 +01:00
Marc Philip Scholten
3bfd884813
Removed vim comments
...
Reformated files
2013-11-23 19:42:26 +01:00
phonzie
3afa655f57
SSH2: Continue Subsystem Implementation.
...
Removed unused piece of code @2352.
Added $this->_get_interactive_channel() to reset(). Unless we don't want to close the subsystem channel?? Leaving that decision up to you.
2013-11-20 16:17:23 -05:00
phonzie
eb3bffaa00
Update SSH2.php
...
Use of undefined property: "$this->bitmask".
In context, it seems that it should reference the "bitmap" property.
2013-11-15 13:34:31 -05:00
terrafrost
c6a52cb1b1
SSH2: add preliminary support for custom SSH subsystems
2013-10-25 12:35:30 -05:00
terrafrost
48b13bc1d7
SSH2: make it so realtime logs filter out password's
...
"Complex" logs already do this - just not realtime logs
2013-09-12 08:45:13 -05:00
terrafrost
9f8d8a7bf6
SSH2: window size handling adjustments
2013-09-12 08:29:14 -05:00
terrafrost
24a06eeff3
SSH2: neither of the DSA signature values should be 0
2013-08-31 00:22:47 -05:00
terrafrost
df45abcda0
SSH2: try to execute commands via interactive shell even if no pty
2013-08-20 23:52:15 -05:00
terrafrost
093a182904
SSH2: Logging updates
2013-07-26 09:57:20 -05:00
terrafrost
bf6da217c1
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-07-22 23:53:45 -05:00
terrafrost
8c9e7a890e
SSH2: more window size adjustments
2013-07-22 23:48:28 -05:00
terrafrost
78f9fadd3d
SSH2: don't remove first byte from complex logs
2013-07-19 10:34:11 -05:00
terrafrost
415df3bd45
SSH2: attribute newly added comment
2013-07-18 10:35:39 -05:00
terrafrost
ccb1c3e2bd
SSH2: include string length in window size adjustments
2013-07-17 23:21:25 -05:00
terrafrost
ffdcf843c1
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-07-14 04:10:54 -05:00
terrafrost
0f96fae818
SSH2: channel handling adjustments
...
- keep track of server -> client window size and look out for NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST packets as appropriate
- send client -> server window size packets based on channel of received packet - not of desired channel
- buffer incoming packets based on received packets channel - not on desired channel
2013-07-14 04:09:16 -05:00
terrafrost
309f79ecea
SSH2: attempt to handle case where window size is smaller than packet size
2013-07-07 16:10:12 -05:00
terrafrost
327a3b8bc8
SSH2: Keep track of client -> server window size
2013-07-07 15:57:15 -05:00
terrafrost
a6289036a0
SSH2: fix possible E_NOTICE
2013-07-07 15:49:49 -05:00
terrafrost
76ea505af8
SSH2: use Crypt_Rijndael instead of Crypt_AES
...
Crypt_AES is pretty much just a wrapper now
2013-06-25 16:44:22 -05:00
terrafrost
a3e6e1578b
SSH2: revamp dynamic listing of crypto algorithms
2013-06-25 15:21:43 -05:00
terrafrost
adf8afd4eb
SSH2: build supported cipher list off of files that are present
2013-06-20 20:51:50 -05:00
terrafrost
2edc9fc0a9
SSH2: reorder cipher preferences
2013-06-20 17:14:20 -05:00
terrafrost
d79ce65fe3
SSH2: close channel and break after exit-signal
...
Prior to efdec7b118
exit-signal's would re-use exit-status's channel closing code. after that commit, however, exit-status specific code was added, which meant that falling through, without the break, broke things
2013-06-10 10:57:34 -05:00