terrafrost
4bd9a546ab
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-12-22 11:53:35 -06: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
f0f029b2c1
CS: Fix "PEAR.Commenting.ClassComment.WrongTagOrder" sniff.
2013-12-11 18:33:18 +01:00
Andreas Fischer
3db1fbb072
CS: Fix "PEAR.Commenting.FileComment.TagIndent" sniff.
2013-12-10 20:10:37 +01:00
Andreas Fischer
6d1fb9f7db
CS: Fix "PEAR.Files.IncludingFile.UseIncludeOnce" sniff.
2013-12-06 01:03:34 +01:00
Andreas Fischer
bc6ff96292
Fix "PEAR.Files.IncludingFile.BracketsNotRequired" sniff.
2013-12-05 23:17:40 +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
terrafrost
2ec8c8c925
Merge pull request #117 from bantu/elliptic-curve-preparation
...
Preparation for ECDH in SSH
2013-06-07 15:24:24 -07:00
terrafrost
e85f5c7198
SSH2: Update timeout functionality
...
Make it so Net_SSH2 doesn't close channel upon timeout. only if reset() is closed will channel be closed.
Also add isTimeout() function
2013-06-07 17:21:11 -05:00
Andreas Fischer
61279f1fb6
[feature/elliptic-curve] Add comment for generator 2 and sha1 hash function.
2013-06-07 01:03:03 +02:00
Andreas Fischer
2fcbd77605
[feature/elliptic-curve] Associate the generator (decimal 2) with the prime.
2013-06-07 00:58:09 +02:00
Andreas Fischer
1c63d4b746
[feature/elliptic-curve] Specify prime data to BigInteger directly in base 16.
2013-06-07 00:55:23 +02:00
Andreas Fischer
1a200f8c7b
[feature/elliptic-curve] Rename $p -> $prime
2013-06-07 00:53:21 +02:00
Andreas Fischer
7253e77386
[feature/elliptic-curve] Do not instantiate unnecessary $x instance.
2013-06-07 00:47:59 +02:00
Andreas Fischer
97cf60900d
[feature/elliptic-curve] Rename $q to $max because that's what it is.
2013-06-07 00:47:37 +02:00
Andreas Fischer
50f5f3f97e
[feature/elliptic-curve] Assign a variable to Math_BigInteger(1).
2013-06-07 00:43:40 +02:00
Andreas Fischer
a730ed6e4c
[feature/elliptic-curve] Use an instance of Crypt_Hash instead of sha1().
2013-06-07 00:38:38 +02:00
terrafrost
e25ae8c4f4
Merge pull request #114 from bantu/fix-weak-ssh-dh-keys
...
Fix weak ssh dh keys
2013-06-05 21:57:15 -07:00
Andreas Fischer
727dba5905
[remove-svn-version-lines] Remove useless @version: $Id$ lines.
...
These lines served some purpose on SVN, but are now useless on Git. They
actually do harm as they might make people think their files are older
than they actually are.
2013-06-02 18:50:46 +02:00
Andreas Fischer
1733c3366c
[fix-weak-ssh-dh-keys] bitwise_leftShift() expects number of bits, not bytes.
2013-06-02 16:55:19 +02:00
Andreas Fischer
252c6ec68d
[fix-weak-ssh-dh-keys] $keyLength is in bytes. Do not compare to 160 bits.
2013-06-02 16:54:02 +02:00
terrafrost
dc76cf5b8e
SSH2: add $callable parameter to exec()
2013-05-28 17:02:27 -05:00
terrafrost
6fdac04fd1
SSH2: fix broken grammer from next to last commit
...
Thanks, bantu!
2013-05-14 17:15:23 -05:00
terrafrost
742fbc188f
SSH2: return false (without error) on channel failure
...
Also update error message. SFTP, for example, makes a channel request even though it's not asking to open a pseudo-terminal.
2013-05-14 16:16:06 -05:00
terrafrost
40af708254
Merge pull request #106 from petrich/optimizations
...
Optimizations
2013-05-14 08:35:31 -07:00
terrafrost
1e2d0ccd9f
SSH2: window size is server -> client, not client -> server
2013-05-13 22:37:32 -05:00
Hans-Jürgen Petrich
b242259d17
optimizations
2013-05-13 12:41:52 +07:00
terrafrost
06044e8632
SSH2: 0x7FFFFFFF == 2GB not 4GB
2013-05-10 16:48:10 -05:00
terrafrost
a48871a865
SSH2: realtime_file logging update
2013-05-10 17:45:57 -04:00
terrafrost
aa3e6c1a99
SSH2: rm last commit; _get_channel_packet() takes care of this lol
2013-05-08 15:13:18 -04:00
terrafrost
b440708a7b
SSH2: check response in exec()
2013-05-08 11:44:34 -05:00
Hans-Jürgen Petrich
fe0cc95265
SSH2: Blowfish: typo... block_size adjustment
...
Changed: Blowfish block_size = 8
re: https://github.com/phpseclib/phpseclib/pull/100
2013-05-08 13:52:18 +07:00
terrafrost
e3a2772c30
SSH2: Add Crypt_Blowfish
2013-05-07 23:17:17 -05:00
Hans-Jürgen Petrich
a83166fe48
SSH2: Typo (Twofish related..)
...
Typo...
2013-05-05 08:59:44 +07:00
terrafrost
5dda3a088f
SSH2: Twofish typos
2013-05-04 13:55:51 -05:00
terrafrost
2c43e9151c
SSH2: add twofish support
2013-05-03 01:45:09 -05:00
terrafrost
3230a7b1f7
SSH2: Add getBannerMessage() function
2013-04-27 19:58:24 -05:00
terrafrost
8cecaf2d2b
SSH2: another CS adjustment
2013-04-27 14:12:59 -05:00
terrafrost
04f5a28bff
SSH2: CS adjustments
2013-04-27 14:10:36 -05:00
terrafrost
d6ee41d957
SSH2: fix E_NOTICE in keyboard interactive code
...
Thanks ravage84!
2013-04-24 01:07:32 -05:00
terrafrost
292340cdd5
SSH2: Improve timeout handling
...
(thanks, SergeyTsalkov!)
2013-04-20 20:43:05 -05:00
terrafrost
e0abab9bb4
SSH2: keyboard-interactive changes
...
Let's say your SSH server had a two-part keyboard-interactive auth. One prompt is for "Password" and the other is for "Verification code". Previously you'd have to do this:
$ssh->login($username, 'pass1', 'code1');
It'd try password authentication with pass1, fail, then do keyboard-interactive with pass1 and then keyboard-interacitve with code1.
ie. the order in which it tried stuff was dependent on the order it was past to the Net_SSH2 object. And it'd always try password auth first.
Now you can go straight to keyboard-interactive and mix the order as follows:
$ssh->login($username, array('Password' => 'pass1'), array('Verification code' => 'code1'));
2013-04-20 14:35:08 -05:00
terrafrost
04c24f6bbc
SSH2: More multi-factor authentication changes
...
Previously to do multi-factor authentication you'd have to do this:
$ssh->login($user, 'pass1');
$ssh->login($user, 'pass2');
Now you can do this too:
$ssh->login($user, 'pass1', 'pass2');
2013-04-20 14:33:07 -05:00
terrafrost
ccd4ce1d19
SSH2: add support for multi-factor authentication
2013-04-19 22:23:06 -05:00
David Stensland
28f18f83ec
SSH2: Be less overly clever loading Crypt/Random
2013-04-01 12:29:28 -04:00
Brett Thomas
cc8e3cdbc1
added getStdError method to get stdErr, even when quiet mode enabled
2013-03-21 17:18:31 -05:00
terrafrost
0333805f5c
SSH2: Add isConnected() function
2013-02-16 14:58:12 -06:00
Mike Kruk
d7e4678fc4
Use enablePTY() to get a PTY with exec() calls. While exec() is running
...
you can use read() and write() to interact with the shell.
2013-02-08 17:04:52 -05:00
terrafrost
248e3bb085
Undo last commit
2013-01-30 08:37:50 -06:00
terrafrost
bfb04dcf4d
Add __construct() constructor to make namespace'ing easier for those wishing to do it
2013-01-29 22:09:31 -06:00
terrafrost
e7336e6b54
add size checking to binary packets in Net/SSH2.php (thanks ?????? ????????!)
2013-01-26 00:17:23 -06:00
Mike Kruk
efdec7b118
Extract the exit_status if given to us from SSH.
2013-01-17 13:47:42 -05:00
terrafrost
5d49af105f
SSH2: $this->channel_buffers is an array - not a string
2013-01-13 11:36:57 -06:00
terrafrost
94ca5e1d0c
SSH1,SSH2: strpos expects string - not array
2013-01-13 10:49:03 -06:00
terrafrost
bccce5802c
SSH2: Use strlen instead of empty
2013-01-12 10:46:19 -06:00
terrafrost
bbed0916cd
SSH2: Make $stop be after all network activity
2013-01-11 18:38:38 -06:00
terrafrost
e71fc97913
Revamp SSH1 logging and go back to using user_error
...
(_handle_error returned the line number in _handle_error - not the line number triggering the error)
2013-01-08 22:09:27 -06:00
terrafrost
35832fe2a1
Refactor crypt_random (renaming it to crypt_random_string)
...
...and update all the calls to it accordingly
2012-12-16 02:20:16 -06:00
terrafrost
3c6ae4312f
The user_error in _handle_error shouldn't be replaced..
2012-11-29 00:19:09 -06:00
terrafrost
3caaa91160
Replace user_error() with new _handle_error() function
...
To use exceptions do define('PHPSECLIB_USE_EXCEPTIONS', true).
To have the exceptions thrown by phpseclib be of a certain class define PHPSECLIB_EXCEPTION_CLASS.
2012-11-28 23:33:15 -06:00
terrafrost
dbc10491e7
Fix an E_NOTICE (thanks chubbypama!)
2012-11-28 08:17:57 -06:00
terrafrost
ff94576315
Remove unused fields from pack()
2012-11-27 14:38:30 -06:00
terrafrost
346bc5dcc8
Make it so none is a supported authentication method
2012-11-22 14:25:57 -06:00
terrafrost
875cef8bbd
Revamp logging
2012-11-22 13:08:30 -06:00
terrafrost
6c33012a4a
Suppress further error messages if connection is prematurely disconnected
2012-11-22 12:11:15 -06:00
terrafrost
bb4995e446
Add $extra to logs
2012-09-30 21:32:26 -05:00
terrafrost
ec5aead746
SSH-2.0-SSHD doesn't implement hmac-*-96 correctly
2012-09-17 02:33:03 -05:00
terrafrost
31ad9aacbd
stream_set_blocking calls were unnecessary
2012-09-09 23:45:18 -05:00
terrafrost
5d91746f73
stream_select() failed when timeout went below 1 second
2012-09-03 14:48:18 -05:00
terrafrost
26776b486e
Update a few comments
2012-09-03 01:42:50 -05:00
terrafrost
5de5d45bd5
Workaround for buggy stream_select's
...
Workaround for this issue:
https://bugs.php.net/bug.php?id=42682
Thanks solefald!
2012-08-29 17:55:22 -05:00
terrafrost
e2ae5100c2
Fix a few E_NOTICEs
2012-08-28 03:04:15 -05:00
Joshua Johnson
1f90170049
Fix typos
2012-08-14 13:12:01 -04:00