terrafrost
db32efb276
SSH2: 0x7FFFFFFF -> $this->window_size in one more place
2014-05-26 17:57:14 -05:00
terrafrost
0dd929341b
SSH2: make it so callback functions can make exec() return early
2014-05-26 17:37:32 -05:00
terrafrost
c100264b65
SFTP: NULL -> null
2014-05-26 16:32:57 -05:00
terrafrost
46ae0da314
SFTP: fix syntax error
2014-05-26 15:42:14 -05:00
terrafrost
a7fa4cc4ff
SFTP: add more stat functions
...
also don't use stat cache for SFTP/Stream.php
2014-05-26 15:39:30 -05:00
Andreas Fischer
518eb861e9
Merge branch 'master' into php5
...
* master:
SFTP: Use the correct stat cache property: stat_cache
2014-05-22 15:27:56 +02:00
Andreas Fischer
f1fbf9c5ae
SFTP: Use the correct stat cache property: stat_cache
2014-05-22 13:32:39 +02:00
Andreas Fischer
39b9ffffdf
Merge branch 'master' into php5
...
* master:
SFTP: last commit had a few ommissions
SFTP Functional tests: Make use of assertNotSame
SFTP Functional tests: Keep story linear.
SFTP: add more unit tests
2014-05-22 13:25:57 +02:00
terrafrost
1ddcd6d873
SFTP: last commit had a few ommissions
2014-05-21 19:55:12 -05:00
Andreas Fischer
4524b9f663
Merge branch 'master' into php5
...
* master:
SFTP: stat cache updates
SFTP: Rudimentary tests for file_exists(), is_file(), is_dir().
2014-05-21 17:55:42 +02:00
terrafrost
4d9214970b
SFTP: stat cache updates
2014-05-21 10:20:36 -05:00
Andreas Fischer
6b2b01347f
Merge branch 'master' into php5
...
* master:
SFTP: use_cache -> use_stat_cache
SFTP: switch from using file existence cache to stat cache, like PHP
SFTP: add support for recursive nlist and rawlist
SFTP: add file_exists, is_dir and is_file functions
2014-05-18 23:21:17 +02:00
Andreas Fischer
7d2a3279c6
Merge pull request #338 from terrafrost/sftp-changes-20140510
...
SFTP: add file_exists, is_dir and is_file functions
* terrafrost/sftp-changes-20140510:
SFTP: use_cache -> use_stat_cache
SFTP: switch from using file existence cache to stat cache, like PHP
SFTP: add support for recursive nlist and rawlist
SFTP: add file_exists, is_dir and is_file functions
2014-05-18 23:20:58 +02:00
terrafrost
36fa9e4e48
SFTP: use_cache -> use_stat_cache
2014-05-18 15:55:12 -05:00
terrafrost
e09a6968da
SFTP: switch from using file existence cache to stat cache, like PHP
...
also add a few new functions - is_link and filesize
2014-05-18 15:34:10 -05:00
terrafrost
0a0398268a
SFTP: add support for recursive nlist and rawlist
2014-05-13 17:10:32 -05:00
terrafrost
77641003fa
SFTP: add file_exists, is_dir and is_file functions
...
also expand caching layer
2014-05-10 19:52:38 -05:00
Andreas Fischer
b7ebb1e0e3
Merge branch 'master' into php5
...
* master:
BigInteger: speedup internal mode slightly
2014-05-06 00:49:46 +02:00
Andreas Fischer
3a309d36ed
Merge pull request #335 from terrafrost/internal-mode-speedup
...
BigInteger: speedup internal mode slightly
* terrafrost/internal-mode-speedup:
BigInteger: speedup internal mode slightly
2014-05-06 00:49:44 +02:00
Andreas Fischer
1821f6b28f
Merge branch 'master' into php5
...
* master:
ASN1: let strings in as well
ASN1: make File_ASN1 accept int primitives and not just Math_BigInteger objects when an integer is expected
2014-05-06 00:41:59 +02:00
terrafrost
1b9c599476
ASN1: let strings in as well
2014-05-05 17:38:33 -05:00
terrafrost
7a9ea673ca
ASN1: make File_ASN1 accept int primitives and not just Math_BigInteger objects when an integer is expected
...
The code to convert the regular integer type into the appropriate format could all just be in-line'd when an integer primitive is used but this approach is easier to read.
2014-05-05 16:39:35 -05:00
terrafrost
309c8fd555
BigInteger: speedup internal mode slightly
...
Changes should yield a slight speedup per the analysis at https://github.com/phpseclib/phpseclib/pull/317#issuecomment-42122335
2014-05-05 11:34:45 -05:00
Andreas Fischer
1d01f56f28
Merge branch 'master' into php5
...
* master:
BigInteger: update comments and add test case
BigInteger: fix some int64 issues
2014-04-29 16:32:59 +02:00
Andreas Fischer
431e3a04c7
Merge branch 'int64-fix'
...
* int64-fix:
BigInteger: update comments and add test case
BigInteger: fix some int64 issues
2014-04-29 16:32:49 +02:00
terrafrost
9eb6e1ed67
BigInteger: update comments and add test case
2014-04-29 16:32:25 +02:00
terrafrost
e4ff01f054
BigInteger: fix some int64 issues
2014-04-29 16:32:25 +02:00
Andreas Fischer
8eeb201de8
Merge branch 'master' into php5
...
* master:
CS: Fix "PEAR.Functions.FunctionCallSignature.Indent" sniff.
2014-04-24 00:41:20 +02:00
Andreas Fischer
c0bdf1bd90
CS: Fix "PEAR.Functions.FunctionCallSignature.Indent" sniff.
2014-04-24 00:26:02 +02:00
Andreas Fischer
b3081f2a61
Merge branch 'master' into php5
...
* master:
SSH2: improve handling of incomplete packets
2014-04-19 15:46:56 +02:00
Andreas Fischer
b90deb5e83
Merge pull request #328 from terrafrost/get_binary_packet
...
SSH2: improve handling of incomplete packets
* terrafrost/get_binary_packet:
SSH2: improve handling of incomplete packets
2014-04-19 15:44:29 +02:00
Andreas Fischer
5cfe1560a0
Merge branch 'master' into php5
...
* master:
BigInteger: explain precense of uncallable code
2014-04-19 14:05:12 +02:00
terrafrost
0cbb631852
BigInteger: explain precense of uncallable code
2014-04-18 23:43:03 -05:00
terrafrost
efd3b96dc8
SSH2: improve handling of incomplete packets
2014-04-18 16:58:00 -05:00
Andreas Fischer
a7da467819
Merge branch 'master' into php5
...
* master:
Added some simple Net_SSH2 tests
2014-04-18 16:55:42 +02:00
Andreas Fischer
b676cc2690
Merge pull request #241 from mpscholten/ssh2-tests
...
Added some simple Net_SSH2 tests
* mpscholten/ssh2-tests:
Added some simple Net_SSH2 tests
Conflicts:
tests/Net/SSH2Test.php
2014-04-18 16:54:24 +02:00
Andreas Fischer
bf7abfcfce
Merge branch 'master' into php5
...
* master:
ASN1: test case updates
ASN1: add test cases for latest changes
ASN1: CS update
ASN1: make developing new ASN.1 scripts a little easier
ASN1: make it so bit string's can have an optional minimum size
ASN1: explicit application tags didn't work (although implicit ones did)
2014-04-18 16:48:05 +02:00
Andreas Fischer
14cfcc1b53
Merge pull request #310 from terrafrost/keberos-fix
...
ASN1 changes
* terrafrost/keberos-fix:
ASN1: test case updates
ASN1: add test cases for latest changes
ASN1: CS update
ASN1: make developing new ASN.1 scripts a little easier
ASN1: make it so bit string's can have an optional minimum size
ASN1: explicit application tags didn't work (although implicit ones did)
2014-04-18 16:47:48 +02:00
terrafrost
317efaf28a
RSA: auto-detect public keys vs private keys
2014-04-17 10:30:32 -05:00
Andreas Fischer
7348ab6ef7
Remove deprecated method Math_BigInteger::setRandomGenerator().
2014-04-13 01:04:37 +02:00
terrafrost
10be403aff
ASN1: CS update
2014-04-12 12:01:04 -05:00
terrafrost
61cd5e4f5a
ASN1: make developing new ASN.1 scripts a little easier
2014-04-10 13:49:28 -05:00
Andreas Fischer
58cdf692f8
Merge branch 'master' into php5
...
* master:
SSH2: move _connect() call to _login() from login()
SSH2: phpdoc updates
SSH: clarify role of constructor / connection timeout
SSH1: do fsockopen() call when login has been called
SSH2: != -> |=
SSH2: phpdoc changes
SSH2: syntax error
SSH2: timeout set in constructor != timeout set by setTimeout()
SSH2: add phpdoc header
SSH2: connect to server in login() function
Conflicts:
phpseclib/Net/SSH2.php
2014-04-10 18:00:38 +02:00
terrafrost
79719e8f74
SSH2: move _connect() call to _login() from login()
...
Per bantu, this is required for it to work with Net/SFTP.php
2014-04-08 08:48:12 -05:00
terrafrost
0ad0bb4c37
SSH2: phpdoc updates
2014-04-07 15:43:31 -05:00
terrafrost
677a291cb3
SSH: clarify role of constructor / connection timeout
...
Also, in Net_SSH2::_connect() $host is used in multiple places. Rather than changing all references to {$this->host}:{$this->port} preserve existing $host reference and update it accordingly
2014-04-07 10:26:46 -05:00
terrafrost
24bb941799
SSH1: do fsockopen() call when login has been called
2014-04-07 00:30:50 -05:00
terrafrost
6fcfe5c885
SSH2: != -> |=
2014-04-07 00:25:38 -05:00
terrafrost
8f08301744
SSH2: phpdoc changes
2014-04-07 00:19:35 -05:00
terrafrost
ab341df973
SSH2: syntax error
2014-04-07 00:16:54 -05:00
terrafrost
f27a49299e
SSH2: timeout set in constructor != timeout set by setTimeout()
2014-04-07 00:02:03 -05:00
terrafrost
fc748346fc
SSH2: add phpdoc header
2014-04-06 23:56:21 -05:00
terrafrost
a14e71f38b
SSH2: connect to server in login() function
...
this change will make it so some parameters can be set after the
Net_SSH2 object has been created. eg. instead of doing
define('NET_SSH2_LOGGING', NET_SSH2_LOG_COMPLEX) one can now do
$ssh->setLogging(...) or something.
2014-04-06 23:45:25 -05:00
terrafrost
c8bf68ac02
ASN1: make it so bit string's can have an optional minimum size
2014-04-05 18:07:35 -05:00
Andreas Fischer
0288817203
Remove the phpseclib/System/SSH_Agent.php BC file.
2014-04-01 23:15:16 +02:00
Andreas Fischer
b7729feea0
Merge branch 'master' into php5
...
* master:
SSH_Agent: add new line at end of file to comply with CS
SSH_Agent: another CS update
SSH_Agent: CS updates
SSH_Agent: mv SSH_Agent to SSH/Agent and create SSH_Agent for BC
2014-04-01 23:14:44 +02:00
Andreas Fischer
a455c1771e
Merge pull request #304 from bantu/ssh-agent-psr0-fix
...
SSH_Agent: mv SSH_Agent to SSH/Agent and create SSH_Agent for BC
* bantu/ssh-agent-psr0-fix:
SSH_Agent: add new line at end of file to comply with CS
SSH_Agent: another CS update
SSH_Agent: CS updates
SSH_Agent: mv SSH_Agent to SSH/Agent and create SSH_Agent for BC
2014-04-01 23:13:58 +02:00
Andreas Fischer
6f4ddf0e33
SSH_Agent: add new line at end of file to comply with CS
2014-04-01 22:54:26 +02:00
terrafrost
1694012f78
SSH_Agent: another CS update
2014-03-30 16:37:11 -05:00
terrafrost
50b250ce69
SSH_Agent: CS updates
2014-03-30 16:32:05 -05:00
Andreas Fischer
51fbabd6d6
Merge branch 'master' into php5
...
* master:
add error suppression to phpinfo()
2014-03-30 17:23:42 +02:00
terrafrost
a8c2ff0fb0
add error suppression to phpinfo()
...
bad timezone settings can make phpinfo() throw errors so we'll just
suppress them. if there are legit non-timezone errors with php install
those will probably be hit in other parts of the code
2014-03-30 10:15:08 -05:00
terrafrost
924014fe72
SSH_Agent: mv SSH_Agent to SSH/Agent and create SSH_Agent for BC
2014-03-30 08:49:22 -05:00
terrafrost
a478b74860
ASN1: explicit application tags didn't work (although implicit ones did)
2014-03-30 01:11:47 -05:00
terrafrost
a9bdce9469
Merge remote-tracking branch 'origin/master' into php5
2014-03-29 15:28:50 -05:00
terrafrost
38502615d3
Merge remote-tracking branch 'michael/fix_cert_time_encoding' into php5
2014-03-29 15:28:39 -05:00
terrafrost
dfa583b9ea
X509: Array -> array (CS consistency)
2014-03-29 15:26:50 -05:00
terrafrost
ea4dc53a06
Merge remote-tracking branch 'michael/fix_cert_time_encoding'
2014-03-29 15:25:32 -05:00
Michael Braun
457f8fbb99
fix certificate date encoding
...
RFC 3280 requires in section
- 4.1.2.5 Validity
- 5.1.2.4 This Update
- 5.1.2.5 Next Update
- 5.1.2.6 Revoked Certificates
that dates are to be encoded as utcTime iff they are before 2050 and
as generalTime otherwise.
Currently, phpseclib does not respect this by always choosing generalTime.
Further, the format used interally to represent dates only keeps two digits,
so dates in 2050 and later cannot be represented in this format.
This patch fixes this by
1. changing the interal format to be capable of unambiguously representing
dates in 2050 or later (i.e. use four digits to represent the year),
2. choosing between utcTime and generalTime accordingly.
Without this patch, openssl_x509_parse complains:
Warning: openssl_x509_parse(): illegal ASN1 data type for timestamp
2014-03-28 15:02:50 +01:00
Andreas Fischer
483b8a7d3c
Merge branch 'master' into php5
...
* master:
fix more ssh channel issues
2014-03-21 18:27:13 +01:00
terrafrost
7a2c7a414c
fix more ssh channel issues
...
In logs that were provided to me phpseclib sent a packet that was 2536 bytes long (excluding the bytes denoting the channel and data length) but the length packet said it was 32764 bytes long (ie. $max_size).
So when $max_size is less than the data being sent and has to be adjusted by a new window adjust message from the server and the adjustment makes $max_Size bigger than the data being sent over problems arise.
SSH's window size has caused issues before. Overall I don't think the SSH specs really explain the window size very well. I opened up an errata on SSH's RFC a while back about the issue.
2014-03-21 02:53:43 -05:00
Andreas Fischer
aecf89c031
Merge branch 'master' into php5
...
* master:
Drop meaningless, outdated, inconsistent version tags in doc blocks.
2014-03-13 00:03:38 +01:00
Andreas Fischer
fb1296bbec
Drop meaningless, outdated, inconsistent version tags in doc blocks.
...
find phpseclib -type f -name "*.php" -exec sed -i '/@version/d' {} \;
2014-03-11 15:58:33 +01:00
Andreas Fischer
cb56e676dc
Merge branch 'master' into php5
...
* master:
Tests for bug280.
Also replace this with call_user_func
Use call_user_func, as this will work on PHP < 5.4, whereas $callback() does not
2014-03-06 12:05:17 +01:00
Andreas Fischer
aa64ddfd4d
Merge pull request #280 from nickygerritsen/master
...
Use call_user_func, as this will work on PHP < 5.4, whereas $callback() does not
* nickygerritsen/master:
Also replace this with call_user_func
Use call_user_func, as this will work on PHP < 5.4, whereas $callback() does not
2014-03-06 12:01:14 +01:00
Andreas Fischer
e4d0906cee
Merge branch 'master' into php5
...
* master:
typofixes - https://github.com/vlajos/misspell_fixer
2014-03-06 10:46:26 +01:00
Veres Lajos
930a3fb4d2
typofixes - https://github.com/vlajos/misspell_fixer
2014-03-05 23:41:20 +00:00
Nicky Gerritsen
b5e579f6c0
Also replace this with call_user_func
2014-03-05 18:38:33 +01:00
Nicky Gerritsen
97d1e75a51
Use call_user_func, as this will work on PHP < 5.4, whereas $callback() does not
2014-03-05 15:44:17 +01:00
Andreas Fischer
201b55866e
Merge branch 'master' into php5
...
* master:
Remove HTML from BigInteger code example.
2014-03-01 01:40:53 +01:00
Andreas Fischer
c1597f4533
Remove HTML from BigInteger code example.
2014-03-01 01:40:28 +01:00
Andreas Fischer
907f062096
Merge branch 'master' into php5
...
* master:
Set permissions of phpseclib/Crypt/RC2.php to 644.
2014-03-01 00:57:05 +01:00
Andreas Fischer
f744fbbcc9
Set permissions of phpseclib/Crypt/RC2.php to 644.
2014-03-01 00:56:08 +01:00
Andreas Fischer
2785826d94
Merge branch 'master' into php5
...
* master:
composer: add System to psr-0 autoload section
update README.md to show latest version
SSH_Agent: a few changes per bantu
2014-02-28 23:17:46 +01:00
terrafrost
b3a1f52bff
SSH_Agent: a few changes per bantu
2014-02-21 23:15:24 -06:00
Andreas Fischer
88e6eef90f
Merge branch 'master' into php5
...
* master:
Add newline at EOF to phpseclib/System/SSH_Agent.php.
SSH_Agent: phpdoc updates
SSH_Agent: misc updates
SSH2: add ssh-agent support
2014-02-21 19:42:36 +01:00
Andreas Fischer
e08c7244e2
Add newline at EOF to phpseclib/System/SSH_Agent.php.
2014-02-21 19:22:09 +01:00
Andreas Fischer
053a9ac9af
Merge pull request #265 from terrafrost/ssh-agent
...
SSH2: add ssh-agent support
* terrafrost/ssh-agent:
SSH_Agent: phpdoc updates
SSH_Agent: misc updates
SSH2: add ssh-agent support
2014-02-21 19:17:51 +01:00
terrafrost
b4b93b80f5
SSH_Agent: phpdoc updates
2014-02-20 13:38:07 -06:00
terrafrost
405ff3f7b4
SSH_Agent: misc updates
2014-02-19 10:13:54 -06:00
Andreas Fischer
51d30ed66f
Merge branch 'master' into php5
...
* master:
CS: Each file MUST end with exactly one newline character
2014-02-11 01:00:52 +01:00
Andreas Fischer
56f1ada5c1
CS: Each file MUST end with exactly one newline character
2014-02-10 14:51:35 +01:00
terrafrost
e90648c7a5
SSH2: add ssh-agent support
2014-02-10 00:04:16 -06:00
Andreas Fischer
addd2ac320
Merge branch 'master' into php5
...
* master:
SSH2: ignore exit_status channel requests
2014-02-03 16:56:46 +01:00
Andreas Fischer
f4dbcb1b78
Merge pull request #264 from terrafrost/exit-status
...
SSH2: ignore exit_status channel requests
* terrafrost/exit-status:
SSH2: ignore exit_status channel requests
2014-02-03 16:56:36 +01:00
terrafrost
cd9801db8a
SSH2: ignore exit_status channel requests
...
Fixes #258
2014-02-02 23:42:06 -06:00
Hans-Jürgen Petrich
50f46959ed
Ciphers: Adding setEngine() and some optimizations
...
Ciphers: Adding setEngine() and some optimizations
2014-01-31 06:13:14 +07:00
Andreas Fischer
0c4cc0bd0e
Merge branch 'master' into php5
...
* master:
Cleaned up whitespace
Conflicts:
composer.json
2014-01-18 18:58:55 +01:00
Graham Campbell
1c2796e3eb
Cleaned up whitespace
2014-01-18 17:29:25 +00:00
Marc Philip Scholten
b7092ebc21
Added some simple Net_SSH2 tests
...
Placed helper at top again in my test
Removed a whitespace
2013-12-28 21:29:52 +01:00
terrafrost
777db22709
Merge branch 'php5' of https://github.com/phpseclib/phpseclib into php5
2013-12-28 13:56:27 -06:00
terrafrost
05077cf0f3
Merge branch 'ssh2-identifier' into php5
2013-12-28 13:50:05 -06:00
terrafrost
268ec2e5d1
Merge branch 'ssh2-identifier'
2013-12-28 13:49:05 -06:00
terrafrost
0ccac2c998
SSH2: add new line in docblock comment
2013-12-28 13:47:24 -06:00
Marc Philip Scholten
19be15c4c4
Fixed typos
2013-12-28 18:16:09 +01:00
Andreas Fischer
d48e284cae
Merge branch 'master' into php5
...
* master:
SFTP: make get() return correctly sized strings
2013-12-28 13:41:09 +01:00
Andreas Fischer
b9e785f292
Merge branch 'master' into php5
...
* master:
RSA: remove unit test for time being - it's going to be renamed and rewritten
RSA: update comments for _extractBER
RSA: more verbose RSA key handling
2013-12-28 13:40:49 +01:00
terrafrost
466f9354df
SFTP: make get() return correctly sized strings
2013-12-27 11:08:33 -06:00
terrafrost
a1b749a0a0
Merge branch 'master' into php5
2013-12-27 10:25:19 -06:00
terrafrost
d2c4ccfc28
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-12-27 10:24:47 -06:00
Marc Philip Scholten
ad0c7c52bd
Fixed cs
2013-12-26 21:02:18 +01:00
Marc Philip Scholten
b0de383f95
Replaced else { if ()...} with elseif() {}
2013-12-26 21:02:17 +01:00
Marc Philip Scholten
357d4253ee
Fixed typo
2013-12-26 21:00:58 +01:00
Marc Philip Scholten
4817d28a54
Refactored Net_SSH2::$identifier and added unit tests
...
Added return tag
2013-12-26 21:00:58 +01:00
Andreas Fischer
28f6f19abe
Merge branch 'master' into php5
...
* master:
SSH2: better accomodate Phar's
2013-12-26 19:43:34 +01: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
060ae325b7
Merge branch 'master' into php5
...
* master:
Fixed classname of test
Fixed some wrong @see annotations
Fixed /e preg_replace modifier exactly like in 0dc8b27a6a
Added Net_SSH1::_format_log test
2013-12-26 18:41:32 +01:00
Andreas Fischer
9c7c01c337
Merge pull request #223 from mpscholten/fix-ssh1-php55
...
Fix Net_SSH1 on Php5.5 (/e preg_replace modifier)
* mpscholten/fix-ssh1-php55:
Fixed classname of test
Fixed some wrong @see annotations
Fixed /e preg_replace modifier exactly like in 0dc8b27a6a
Added Net_SSH1::_format_log test
2013-12-26 18:41:25 +01:00
Marc Philip Scholten
6d8c02c432
Fixed some wrong @see annotations
2013-12-26 12:09:40 +01:00
Andreas Fischer
83fbeac766
Merge branch 'master' into php5
...
* master:
Fix indentation of _append_log in SSH1 and SSH2.
2013-12-26 12:00:42 +01:00
Andreas Fischer
0f69d35584
Fix indentation of _append_log in SSH1 and SSH2.
2013-12-26 11:45:24 +01:00
Andreas Fischer
231f5a2697
Merge branch 'master' into php5
...
* master:
Use NET_SSH1_ instead of NET_SSH2_ prefix in SSH1.
2013-12-26 11:42:19 +01:00
Andreas Fischer
2da2f5d29f
Merge pull request #227 from bantu/ssh2-constant-prefix-ssh1
...
Use NET_SSH1_ instead of NET_SSH2_ prefix in SSH1.
* bantu/ssh2-constant-prefix-ssh1:
Use NET_SSH1_ instead of NET_SSH2_ prefix in SSH1.
2013-12-26 11:42:11 +01:00
Andreas Fischer
7f6ac90380
Merge branch 'master' into php5
...
* master:
CS: Add useful whitespace CodeSniffer rules.
2013-12-26 11:39:25 +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
terrafrost
b23a693ae5
RSA: update comments for _extractBER
2013-12-26 01:46:58 -06:00
Andreas Fischer
c033e4ea57
Merge branch 'master' into php5
...
* master:
SFTP: add explanation for use of 4294967296
SSH2: typos in last commit
Compatibility fixes
2013-12-26 00:37:08 +01:00
Andreas Fischer
8bb80b3df0
CS: Add useful whitespace CodeSniffer rules.
2013-12-26 00:33:08 +01:00
Andreas Fischer
4290a5c216
Use NET_SSH1_ instead of NET_SSH2_ prefix in SSH1.
2013-12-26 00:26:36 +01:00
terrafrost
172f15f5df
SFTP: add explanation for use of 4294967296
2013-12-24 23:44:21 -06:00
terrafrost
3a0193875a
RSA: more verbose RSA key handling
2013-12-24 18:37:43 -06: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
Marc Philip Scholten
ea8cadddad
Fixed /e preg_replace modifier exactly like in 0dc8b27a6a
2013-12-18 16:39:36 +01: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
1599d2e8d1
SCP: use the new "mode" for _close_channel
2013-12-15 12:07:17 -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
9c0b5e1453
Merge branch 'master' into php5
...
* master:
CS: Fix "PEAR.Formatting.MultiLineAssignment.EqualSignLine" sniff.
2013-12-10 12:42:25 +01:00
Andreas Fischer
cee0f3343b
CS: Fix "PEAR.Formatting.MultiLineAssignment.EqualSignLine" sniff.
2013-12-07 20:47:30 +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
ef2c50f9e0
Ignore coding style for "HAC 4.49" block in Math/BigInteger.php.
2013-12-03 21:04:13 +01:00
Andreas Fischer
161bb7d362
CS: Fix PEAR.ControlStructures.ControlSignature sniff.
2013-12-03 21:04:13 +01:00
Andreas Fischer
9ca5f83dec
CS: Fix Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma sniff.
2013-12-03 20:52:08 +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
702ade7d12
SFTP: Removed dead code
...
variable: $initialize = true, ironically - is initialized but never used.
Feel free to deny if this is reserved for future implementation(s).
2013-11-20 15:02:04 -05:00
terrafrost
fcfc0e2c00
SFTP: don't do $dir[-1] check if $dir === ''
2013-11-20 09:33:47 -06:00
terrafrost
187f40a247
Merge pull request #173 from h4cc/patch-1
...
Making Net_SFTP::chdir capable of handling the empty string.
2013-11-20 07:29:16 -08:00
terrafrost
478dd38e8f
SFTP/Stream: log when constructor is called
2013-11-20 09:11:14 -06:00
Julius Beckmann
44078e5f40
Making Net_SFTP::chdir capable of handling the empty string.
...
Updated patch after hint from bantu.
2013-11-20 15:08:50 +01:00
Julius Beckmann
9ea67f9edb
Making Net_SFTP::chdir capable of handling the empty string.
...
Fixing a ugly notice when using the empty string as parameter for chdir:
Notice: Uninitialized string offset: -1 in Net/SFTP.php line 617
2013-11-20 14:49:16 +01:00
Vincent Petry
2517dd4a61
Initing eof to false
...
The call _stream_eof() must return a boolean, not null.
Returning null makes PHP believe that the method wasn't implemented.
Fixes #170
2013-11-19 23:13:10 +01:00
phonzie
8dd12ed467
SFTP_Stream: Fixed typo in _parse_path
...
typo: isset($this->contenxt)
should be $this->context
2013-11-19 14:23:54 -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
300a3afe8d
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-11-10 22:38:36 -06:00
terrafrost
755f0f17a5
RSA: putty keys weren't being formatted correctly
2013-11-10 22:27:48 -06:00
Andreas Fischer
2241d0e6f4
Partial revert of 9f1108e52e
.
...
This change should not be necessary.
2013-11-06 23:12:00 +01:00
Frank de Jonge
4976cd1622
Fixed coding style to comply with other not defined statements
2013-11-05 13:01:03 +01:00
Frank de Jonge
9f1108e52e
Check wether CRYPT_RANDOM_IS_WINDOWS is defined before defining it.
2013-11-05 11:27:16 +01:00
Jesse Schalken
71ae795460
Fixed typo in object class name comparison
2013-11-04 17:48:01 +11:00
Brian Nesbitt
ccad4b7d08
Added a callable to put for progress updates
...
This in combination with https://github.com/maximebf/ConsoleKit ProgressBar makes me feel good.
2013-11-01 12:15:28 -04:00
terrafrost
c6a52cb1b1
SSH2: add preliminary support for custom SSH subsystems
2013-10-25 12:35:30 -05:00
terrafrost
15677715e3
RSA: only set $this->current when it's already set
2013-10-24 15:48:15 -05:00
terrafrost
5888c6cef6
SCP: if exec() failed return false immediately
2013-10-21 15:15:31 -05:00
terrafrost
1e3ff81e7d
RSA: make RSA objects clonable
2013-10-18 13:24:06 -05:00
terrafrost
22502c24cd
ASN1: variable functions had to be strings before PHP 5.4
2013-10-12 12:19:54 -05:00
terrafrost
a577a09a4f
X509: make it so ip addresses and domain names can be used together
2013-10-09 14:51:34 -05:00
terrafrost
9b53c45f04
ASN1,X509: add support for ip addresses in subjaltname
...
(among other places)
2013-10-09 14:25:52 -05:00
terrafrost
9c5563503e
RSA: public key was never getting set
2013-10-06 02:23:57 -05:00
terrafrost
402b7e8176
RSA: if setPublicKey is called unneccessarily return false
2013-10-05 21:30:57 -05:00
terrafrost
d2f6362878
X509: assume anything being passed into setPublicKey() is a public key
2013-10-05 21:28:33 -05:00
terrafrost
77447a3fc7
BigInteger, RSA: updates to OpenSSL version detection code
2013-09-20 12:14:01 -05:00
terrafrost
71743ce243
SFTP: change max sftp packet size
...
1 << 20 isn't as reliable as 1 << 15 and doesn't seem to result in significant speedup either
2013-09-12 10:16:41 -05:00
terrafrost
eb61afd22f
SFTP: make "queue size" settable by a constant
2013-09-12 09:10:36 -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
2b3fe58dbc
RSA: fix E_NOTICE
2013-09-11 21:13:23 -05:00
terrafrost
815f609887
RSA: check to see if MATH_BIGINTEGER_MODE_DISABLE is defined
2013-09-11 11:48:40 -05:00
terrafrost
54f0f2131b
RSA, BigInteger: add more openssl checks
2013-09-10 11:07:56 -05:00
terrafrost
56f1b6f411
SCP: better binary local file support for put()
2013-09-04 02:14:36 -05:00
terrafrost
bafbf1276e
SCP: make it so local files can be uploaded
2013-09-02 22:33:50 -05:00
terrafrost
f16a1135c6
SCP: get() doesn't return true on success
2013-09-02 21:18:57 -05:00
terrafrost
24a06eeff3
SSH2: neither of the DSA signature values should be 0
2013-08-31 00:22:47 -05:00
terrafrost
ebb1d53af5
SFTP: another comment typo
2013-08-29 16:38:05 -05:00
terrafrost
69bc362a83
SFTP: update comment typo
2013-08-29 11:09:47 -05:00
terrafrost
bf6d1bc253
SFTP_Stream: fix errors when context isn't defined
2013-08-28 13:55:14 -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
55d43a9972
ANSI: </underline> -> </u>
2013-08-11 09:07:22 -05:00
terrafrost
ffca003225
SFTP: CS adjustment
2013-08-07 09:22:52 -05:00
terrafrost
442922ff0a
BigInteger: refactor random number generation code somewhat
2013-08-06 23:17:49 -05:00
terrafrost
7b5542cc8a
X509: re-use existing BER extraction code
2013-08-02 10:52:58 -05:00
terrafrost
0149644210
RSA: fix error when exponent isn't co-prime to lcm
2013-07-31 21:50:40 -05:00
terrafrost
73f167e99e
X509: load Math/BigInteger for ASN1 description
2013-07-30 16:07:40 -05:00
Andreas Fischer
25a60ff9a3
SFTP: Fix syntax error "unexpected T_SL, expecting ',' or ';'".
...
Regression from d95f5946eb
.
2013-07-27 15:55:48 +02:00
terrafrost
d714dd35f0
X509: $csr -> $spkac in loadSPKAC() function
2013-07-26 16:10:34 -05:00
terrafrost
d52f217512
X509: change return value for validateSignature when cert isn't loaded
2013-07-26 15:40:16 -05:00
terrafrost
d95f5946eb
SFTP: use variable sizes for get()
2013-07-26 10:20:59 -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
b0090e2ebc
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-07-17 23:26:39 -05:00
terrafrost
ccb1c3e2bd
SSH2: include string length in window size adjustments
2013-07-17 23:21:25 -05:00
terrafrost
ae2a0886a5
RSA: remove extra new line
2013-07-16 11:21:46 -05:00
terrafrost
e295d51409
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-07-14 04:42:15 -05:00
terrafrost
01bb284119
X509: adjust case of id-at-stateorprovinceName
...
Re: https://github.com/phpseclib/phpseclib/issues/130
2013-07-14 04:40:12 -05:00
terrafrost
84093715c2
Merge pull request #129 from johnsterling/string-shift-alt
...
Optimization by replacing _string_shift()
2013-07-14 02:17:39 -07: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
John Sterling
5e0d58f082
SFTP: Add optimization for put() with NET_SFTP_LOCAL_FILE
...
Use substr() instead of _string_shift().
2013-07-11 17:32:49 -04: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
Patrick Monnerat
23d48c4fc5
ASN1: Integers should by at least 1 byte long.
...
Fixes https://github.com/phpseclib/phpseclib/issues/126 .
2013-07-01 14:38:35 +02:00
Patrick Monnerat
e644c42efa
RC2: Changes according to arguments in https://github.com/phpseclib/phpseclib/pull/124
2013-06-28 16:32:06 +02:00
Patrick Monnerat
a76558541c
Merge branch 'master' of https://github.com/petrich/phpseclib into petrich-master
...
Apply pull request https://github.com/phpseclib/phpseclib/pull/124
2013-06-28 11:37:40 +02:00
Hans-Jürgen Petrich
f102ce62e2
Crypt_Base: removed die(1)
...
re:
89ea2da86b (commitcomment-3505770)
2013-06-26 13:15:04 +07:00
Hans-Jürgen Petrich
af1700a025
Crypt_base: Typo
2013-06-26 11:55:19 +07:00
Hans-Jürgen Petrich
89ea2da86b
Crypt_*: CS and comments
...
- Crypt_* Some CS
- Crypt_Base: better comments for phpseclib developers
- Crypt_Base::_createInlineCryptFunction(): better namespace for
internal variables (all now prefixed with an underscore to avoid
conflicts)
2013-06-26 11:50:40 +07: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
3b56c695e2
SFTP: get() didn't return data
2013-06-25 16:37:20 -05:00
terrafrost
7863f476d2
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-06-25 15:22:20 -05:00
terrafrost
a3e6e1578b
SSH2: revamp dynamic listing of crypto algorithms
2013-06-25 15:21:43 -05:00
Hans-Jürgen Petrich
b5da66e979
RC2: Optimizations, inline-crypt bug fix
2013-06-25 13:38:50 +07:00
Patrick Monnerat
b247ad1743
Add Crypt RC2 algorithm.
2013-06-24 19:17:13 +02: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
4de71168d8
RSA: loading XML private keys didn't always work
2013-06-20 17:05:29 -05:00
terrafrost
30408ff8fb
BigInteger: define $p
2013-06-18 09:31:33 -04:00
terrafrost
c0fa1ee0b9
SFTP: didn't define a constant
2013-06-12 14:16:47 -05:00
terrafrost
7b3434c01f
Merge remote-tracking branch 'origin/master' into Crypt_Base
...
Conflicts:
phpseclib/Crypt/DES.php
phpseclib/Crypt/RC4.php
2013-06-11 14:59:13 -05:00
terrafrost
05715e13e7
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-06-11 12:51:10 -05:00
terrafrost
cbe156f0cb
SFTP: Update how resumes work
2013-06-11 12:49:45 -05:00
terrafrost
17d73a4e35
AES: use ()'s for require_once
...
All other require_once's use them so for consistency this one ought to too
2013-06-10 16:39:49 -05:00
terrafrost
5c3c9f990f
SFTP: remove isset() from constructor
2013-06-10 15:42:35 -05:00
terrafrost
799c8e322f
Merge pull request #119 from VaclavSir/sftp_default_port
...
Net_SFTP_Stream: Use default SFTP port, if no port specified
2013-06-10 13:40:54 -07:00
Vaclav Sir
b0ee4d5591
Net_SFTP_Stream: Use default SFTP port, if not set otherwise.
2013-06-10 21:40:03 +02:00
terrafrost
a83ff6cad8
SFTP: add _close_handle() function and close handle on put failure
2013-06-10 13:21:58 -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
fe3765fe17
X509: don't validate self-signed certs by default
2013-06-08 12:40:39 -05:00
terrafrost
9bcee47f2e
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-06-08 11:12:49 -05:00
terrafrost
043ad01eca
BigInteger: refactor randomPrime somewhat
2013-06-08 11:10:52 -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
Andreas Fischer
dadaaf791e
Remove unused variable $generator from Math_BigInteger::random().
2013-06-06 17:17:15 +02:00
terrafrost
32a47d2fbc
BigInteger: docblock update
2013-06-06 00:02:26 -05: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
Hans-Jürgen Petrich
6c4b0cb833
RC4: removed __destruct()
...
Re: https://github.com/phpseclib/phpseclib/issues/107
2013-06-03 06:39:18 +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
aa2e1ff177
[sourceforge-url-typo] {htp:// -> http://}phpseclib.sourceforge.net
2013-06-02 17:56:05 +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
Hans-Jürgen Petrich
fb8d185804
Base/AES/Rijndael: Optimizations
...
- Base/Rijndael/AES: Comments updated.
- Base: removed __desctructor(). Re:
https://github.com/phpseclib/phpseclib/issues/107
- Base: setPassword() will use >= php-5.5's new (faster) hash_pbkdf2()
function if availalbe/possible. 100% compatible to the internal
implementation. Strong testet with all
hashes/iterations/lengths/ciphers.
- Rijndael: Runtime engine-switch: Will now use mcrypt (in case of
128/192/256-bit block/keys), if possible. Otherwise MODE_INTERNAL.
AES: Soucecode reducing. After all, now, AES.php is virtually nothing
other than a wrapper to Rijndael.php::new
Crypt_Rijndael()->setBlockLength(128). No different in speed or
functionality, but fixed block_size.
2013-06-02 16:21:32 +07:00
Hans-Jürgen Petrich
53276ba4a1
AES: inconsistencey with 160 / 224-bits keys
...
re: https://github.com/phpseclib/phpseclib/issues/110
2013-06-01 08:00:04 +07:00
terrafrost
dc76cf5b8e
SSH2: add $callable parameter to exec()
2013-05-28 17:02:27 -05:00
Hans-Jürgen Petrich
e71ec8f4c8
CS adjustments
2013-05-25 18:10:20 +07:00
Hans-Jürgen Petrich
35f1b8dc2b
Method namings
2013-05-25 14:08:17 +07:00
Hans-Jürgen Petrich
5429504aee
CS adjustment
2013-05-25 11:22:25 +07:00
Hans-Jürgen Petrich
995c09cb67
CS and method namings
2013-05-25 09:05:24 +07:00
Hans-Jürgen Petrich
72fa880aa2
BL/TF optimizations. 3DES: +20% speed
...
- Blowfish/Twofish small optimizations
- 3DES +20% speedup from Patrick's commit:
f596c577cf
2013-05-23 01:11:08 +07:00
Patrick Monnerat
f596c577cf
DES: move IP/inverse IP transforms out of the round loop in inline_crypt_setup().
...
This is another 20% runtime gain on triple DES.
2013-05-21 16:01:10 +02:00
Hans-Jürgen Petrich
55ff00cc35
Crypt_Base
...
Crypt_Base() implementation
2013-05-20 13:19:38 +07:00
Hans-Jürgen Petrich
448be87e83
Twofish: bugfix in setPasswort()
...
fixed bug in setPasswort()... (occurred only in Twofish.php)
2013-05-19 23:35:06 +07:00
terrafrost
eabd0a8963
SFTP: add the same multi-factor auth support that Net_SSH2 enjoys
2013-05-14 17:32:31 -05:00
terrafrost
6fdac04fd1
SSH2: fix broken grammer from next to last commit
...
Thanks, bantu!
2013-05-14 17:15:23 -05:00
terrafrost
7fe989a449
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-05-14 17:13:06 -05:00
terrafrost
cb10016291
SFTP: attempt to utilize SFTP via CLI if subsystem is unavailable
2013-05-14 17:08:54 -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
b2262f731d
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-05-14 11:02:45 -05:00
terrafrost
33e415cb4d
Merge remote-tracking branch 'vlajos/master'
2013-05-14 11:01:58 -05:00
terrafrost
af3f275f19
SFTP: $content isn't defined when file is being written to
2013-05-14 10:43:17 -05:00
terrafrost
ff88b7e685
ASN1: CS adjustments
2013-05-14 10:38:01 -05:00
terrafrost
40af708254
Merge pull request #106 from petrich/optimizations
...
Optimizations
2013-05-14 08:35:31 -07:00
terrafrost
2ab6497e41
Merge remote-tracking branch 'origin/largerfiles'
2013-05-13 22:38:11 -05: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
Veres Lajos
ddaf520b3b
typofixes
2013-05-10 11:51:49 +01:00
terrafrost
8aada4b30d
SFTP: looks like some SFTP servers will fail unless write flag is also enabled
2013-05-09 16:35:47 -05:00
terrafrost
b4ebc5b931
SFTP: fix formatting of touch open call
2013-05-09 17:27:56 -04:00
terrafrost
d2d4e89ffc
SFTP: typo
2013-05-09 13:23:54 -04:00
terrafrost
2c80ac8aca
SFTP: Add support for files larger than 2GB
...
0x7FFFFFFF is about 2GB. To support larger files floating point is used
2013-05-09 00:02:04 -05: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
terrafrost
63ec6e2055
SFTP: remove $start = $offset line
...
$start isn't used anywhere in the function
2013-05-08 10:20:35 -05:00
terrafrost
0bdf39c83b
Merge pull request #101 from johnsterling/rsa-comment
...
Add support for custom RSA key comments.
2013-05-08 08:11:20 -07:00
Veres Lajos
dd2a4ddff2
typofixes
2013-05-08 15:34:07 +01:00
terrafrost
9ac94a7b74
Merge pull request #103 from rlerdorf/patch-1
...
Fix a couple of minor logic problems
2013-05-08 05:19:49 -07: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
Rasmus Lerdorf
b47109cf55
And here too, size-related logic problems
2013-05-07 23:21:53 -07:00
Rasmus Lerdorf
e24d7612a2
I think this is what you meant to do here
2013-05-07 23:19:50 -07:00
terrafrost
c89db52e39
Twofish: make CS more consistent
2013-05-07 23:23:07 -05:00
terrafrost
d396b0c503
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-05-07 23:18:07 -05:00
terrafrost
e3a2772c30
SSH2: Add Crypt_Blowfish
2013-05-07 23:17:17 -05:00
John Sterling
c1244805cf
Add support for custom RSA key comments.
...
Add ivar and set/getComment() instead of constant. Also parse comment from applicable formats in loadKey().
2013-05-05 19:38:34 -04:00
Hans-Jürgen Petrich
dcac12003a
Blowfish
...
Blowfish implementation
2013-05-05 09:32:00 +07: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
3ac29adff1
Merge remote-tracking branch 'petrich/master' into twofish
2013-05-03 01:43:43 -05:00
terrafrost
232d3e2725
Random: remove comment for old code
2013-05-01 08:13:41 -05:00
terrafrost
65a6c85450
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-05-01 00:33:13 -05:00
terrafrost
cb36b811a0
Random: use constant for windows test
...
BigInteger: Docblock adjustments
2013-05-01 00:30:01 -05:00
Hans-Jürgen Petrich
be47960908
Twofish
...
Twofish implementation
2013-04-30 17:26:14 +07:00
Hans-Jürgen Petrich
6b7c1da103
DES: removed debug code
...
removed debug code
2013-04-30 14:53:27 +07:00
terrafrost
960dbe4f62
Merge pull request #94 from petrich/DES-3DES-Performance-Update
...
DES/3DES performance update
2013-04-30 00:13:36 -07:00
terrafrost
08e987cede
BigInteger: Docblock adjustments
2013-04-27 20:55:25 -05:00
terrafrost
3230a7b1f7
SSH2: Add getBannerMessage() function
2013-04-27 19:58:24 -05:00
terrafrost
83ebb08f0a
SCP: Update example
2013-04-27 16:06:05 -05:00
terrafrost
9555ddc212
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-04-27 16:04:27 -05:00
terrafrost
4c8173dc23
Add an SCP class
2013-04-27 16:03:35 -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
46f3039217
SFTP: Fix broken mkdir
...
Thanks Antek88!
2013-04-26 18:36:00 -05:00
Hans-Jürgen Petrich
c4752cbeba
DES / 3DES Performance Update
...
DES / 3DES Performance Update.
Inline en/decrypting gives additional ~25% performance.
100% compatible with the current DES/TribleDES.php
Strong testet on Windows/Linux 32/64bit with php4/5.0/5.1//5.2/5.3/5.4
2013-04-25 14:16:10 +07:00
Patrick Monnerat
a13684584c
DES: fix file permissions.
2013-04-24 11:02:01 +02:00
Patrick Monnerat
a8e5ccf895
DES: pre-permuted tables version.
2013-04-24 11:00:11 +02:00
terrafrost
d6ee41d957
SSH2: fix E_NOTICE in keyboard interactive code
...
Thanks ravage84!
2013-04-24 01:07:32 -05:00
mdesign83
2b4e940885
SFTP: Adding missing status codes
2013-04-23 16:04:50 +02:00
terrafrost
a229b2a32d
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-04-20 20:45:00 -05:00
terrafrost
292340cdd5
SSH2: Improve timeout handling
...
(thanks, SergeyTsalkov!)
2013-04-20 20:43:05 -05:00
terrafrost
f16d8ba6b2
Hash: docblock updates
2013-04-20 20:09:42 -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
terrafrost
7ff96b3946
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-04-15 23:59:47 -05:00
terrafrost
a47c1c3980
Net_SFTP_Stream: Add limited support for notifications and...
...
...add NET_SFTP_STREAM_LOGGING
2013-04-15 23:58:13 -05:00
terrafrost
700d28f642
RSA: apply terite's changes to RSA.php too
2013-04-08 01:04:52 -05:00
terrafrost
39e5b1d029
Merge pull request #87 from terite/master
...
Fix SSH2 when autoloaded from Composer
2013-04-05 12:21:46 -07:00
terrafrost
1c7fb5bd67
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-04-02 19:37:36 -05:00
terrafrost
fae87be6f5
X509: Revamp base64 handling
2013-04-02 19:36:52 -05:00
David Stensland
28f18f83ec
SSH2: Be less overly clever loading Crypt/Random
2013-04-01 12:29:28 -04:00
terrafrost
5cd0191edd
SFTP_Stream: update includes
2013-04-01 10:53:55 -05:00
terrafrost
147c3ebea4
ASN1: if an int val would be '' make it be "\0"
2013-03-26 19:50:24 -05:00
terrafrost
725a2e0b39
SFTP: add a few comments
2013-03-24 20:28:55 -05:00
terrafrost
05e832d14f
SFTP_Stream: Better EOF detection
...
$result will be false on error and '' if the EOF is reached.
2013-03-24 20:25:58 -05:00
terrafrost
c5bd12dd14
RSA: Add CRYPT_RSA_PKCS15_COMPAT mode
2013-03-23 14:13:24 -05:00
terrafrost
a3e3682feb
ASN.1: Add headerlength and fix start
2013-03-23 12:12:29 -05:00
Brett Thomas
cc8e3cdbc1
added getStdError method to get stdErr, even when quiet mode enabled
2013-03-21 17:18:31 -05:00
terrafrost
11a6b1a1af
RSA: only use OpenSSL if openssl.cnf file exists
2013-03-21 10:43:27 -05:00
terrafrost
95f40d9c8f
SFTP_Stream: Cache didn't work correctly
2013-03-13 23:30:52 -05:00
terrafrost
3153daf548
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-03-12 20:58:37 -05:00
terrafrost
5212c78152
SFTP: Add Stream class
2013-03-12 20:57:40 -05:00
terrafrost
35f5c83d36
Random: CS adjustment
2013-03-09 21:15:01 -06:00
terrafrost
89cd8f09e7
SFTP: rename variable to correct case
2013-03-09 11:37:53 -06:00
terrafrost
b9787a81eb
SFTP: make mode an alias of permissions for stat
2013-03-08 14:18:32 -06:00
terrafrost
0692d42980
SFTP: Use stat instead of lstat for size()
2013-03-08 11:20:39 -06:00
terrafrost
51d106b6ec
SFTP: Revamp file type detection and add truncate method
...
Also clean up some code
2013-03-08 00:53:34 -06:00
terrafrost
d4f176b434
SFTP: CS adjustment
2013-03-07 22:46:58 -06:00
terrafrost
56f87c8f3a
SFTP: Don't do stat if lstat fails
2013-03-07 10:56:24 -06:00
Hans-Jürgen Petrich
ee84c4b41d
$plaintext should be $ciphertext
2013-03-06 18:14:27 +07:00
terrafrost
42f22a4e44
BigInteger: fix special case for base-10 / bcmath
...
echo new Math_BigInteger('-') when in bcmath mode would output '-' - not '0'
2013-03-05 08:37:59 -06:00
terrafrost
4e06ab52dd
BigInteger: revamp base-10 regex
...
new Math_BigInteger('-09') gave 0 back as a number in GMP mode
2013-03-05 08:29:06 -06:00
terrafrost
994c2c6c79
Rijndael, TripleDES: $block not defined in these either
2013-03-05 00:19:11 -06:00
terrafrost
5f64ab67ab
DES: $block wasn't defined
2013-03-04 08:25:40 -06:00
terrafrost
c4b3288851
TripleDES, Rijndael: Fix overflow in OFB mode
2013-03-03 17:30:30 -06:00
terrafrost
7ce05ed591
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-03-03 11:30:54 -06:00
terrafrost
15817a416e
DES: Fix memory leak in OFB mode
2013-03-03 11:30:03 -06:00
Hans-Jürgen Petrich
eff0bb21c5
3DES/Rijndael/AES: Fix memory leak with CTR mode
...
Related to: https://github.com/phpseclib/phpseclib/issues/77
2013-03-03 17:26:41 +07:00
terrafrost
bf3ca6312e
DES: Fix memory leak with CTR mode
2013-03-03 00:31:48 -06:00
terrafrost
1d1c2782e9
SFTP: Fix bug whereby sometimes download amount would be ignored
2013-02-27 22:10:33 -06:00
terrafrost
eb860d275e
RSA: Add support for AES-256-CBC
2013-02-27 20:00:20 -06:00
terrafrost
44864874e5
SFTP: Redo mkdir() and _realpath()
...
Also make it so nlist() caches directories as well
2013-02-27 00:47:17 -06:00
Hans-Jürgen Petrich
e90708297a
Removed Debug function...
...
Removed Debug function...
2013-02-25 17:54:06 +07:00
Hans-Jürgen Petrich
afa5465e63
AES/Rijndael Performance Update [3]
...
Performance Update for AES/Rijndael
2013-02-25 12:19:51 +07:00
terrafrost
d7b348771c
ANSI: Use user_error instead of echo
2013-02-22 08:29:17 -06:00
terrafrost
1231f58aa3
ANSI: Add support for more codes
...
Thanks chubby!
2013-02-22 01:50:46 -06:00
Patrick Monnerat
6b49b7d108
X509: Fix private key identifier computation on a File_ASN1_Element
2013-02-21 15:46:10 +01:00
terrafrost
d7cdea6282
BigInteger: CS adjustment
2013-02-20 15:11:36 -06:00
Patrick Monnerat
90ff746ad1
Make all sources 7-bit ASCII.
2013-02-20 19:25:47 +01:00
Gemorroj
8d5e7a3945
Fixed broken characters.
2013-02-20 18:11:23 +03:00
Gemorroj
1e3e44e3c6
revert == instead ===
2013-02-20 17:55:44 +03:00
Gemorroj
cc2c844d0e
some minor fixes
2013-02-20 16:46:13 +03:00
terrafrost
4334d381b9
BigInteger: E_NOTICE: bitwise_xor and bitwise_or had parameters of array_pad mixed up
2013-02-17 18:53:36 -06:00
terrafrost
60b66e3726
SFTP: Add chown and chgrp.
2013-02-17 18:23:35 -06:00
terrafrost
4a96cc8024
Use base-2**26 on systems with 32-bit ints and base-2**31 on systems with 64-bit ints
2013-02-17 17:52:59 -06:00
terrafrost
0333805f5c
SSH2: Add isConnected() function
2013-02-16 14:58:12 -06:00
terrafrost
25c7e7bd96
SFTP: Add touch function
...
Also make it so chmod will auto-switch the filename / permissions if they're not in the "right" order (PHP's chmod and ftp_chmod order them differently from each other so this'll make phpseclib consistent with both)
2013-02-14 12:10:36 -06:00
terrafrost
faaa52774f
SFTP: Add the ability to write to specific parts of files
2013-02-12 20:45:09 -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
Hans-Jürgen Petrich
93f9922410
Small CS fix [2]
2013-02-07 00:45:03 +07:00
terrafrost
dba98cd57f
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2013-02-05 07:55:06 -06:00
terrafrost
5910f7c14f
Update date format in File/X509.php
...
Update it to be consistent with bdd42c448b
Thanks runaway518!
2013-02-05 07:53:36 -06:00
Hans-Jürgen Petrich
323396df3c
Small CS fix
2013-02-03 23:19:09 +07:00
Hans-Jürgen Petrich
b4bbb27ef6
AES: Performance update
...
Performance update for AES
2013-01-31 00:59:53 +07:00
terrafrost
13eb688c90
AES, RC4: CS adjustments
2013-01-30 08:39:02 -06: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
6765cb3b2b
Rijndael, AES: CS adjustments
2013-01-27 01:21:28 -06:00
terrafrost
7894fd98f5
Merge pull request #65 from petrich/patch-3
...
Rijndael: Performance update
2013-01-26 16:29:26 -08:00
terrafrost
01be859b44
Merge pull request #66 from petrich/patch-5
...
AES: Performance update
2013-01-26 16:29:10 -08:00
terrafrost
d774476bcf
RC4: keys were never being set in continuous mode
2013-01-26 11:16:42 -06:00
Hans-Jürgen Petrich
7dceef6ef4
AES: Performance update
...
Performance update for AES
Related to: https://github.com/phpseclib/phpseclib/pull/65
2013-01-26 16:58:31 +07:00
Hans-Jürgen Petrich
c95b997fa7
Rijndael: Performance update
...
Performance update for Rijndael
2013-01-26 16:54:19 +07:00
terrafrost
e7336e6b54
add size checking to binary packets in Net/SSH2.php (thanks ?????? ????????!)
2013-01-26 00:17:23 -06:00
terrafrost
111544428e
Merge pull request #63 from petrich/patch-3
...
Rijndael: little code optimizing
2013-01-25 21:52:40 -08:00
Hans-Jürgen Petrich
376b2759c9
RC4: fixed ContinuousBuffer() using MODE_MCRYPT
...
Fixed multiple calls to ContinuousBuffer() using MODE_MCRYPT
2013-01-21 21:01:37 +07:00
Hans-Jürgen Petrich
d81563d6f3
Rijndael: little code optimizing
...
little code optimizing
2013-01-21 15:46:44 +07:00
terrafrost
45976002c7
Merge pull request #61 from petrich/patch-3
...
AES: Fixed CFB decrypt() using MODE_MCRYPT and ContinuousBuffer
2013-01-20 22:57:43 -08:00
Hans-Jürgen Petrich
bfab4c47f9
DES: Fixed CFB decrypt() using MODE_MCRYPT and ContinuousBuffer
...
DES: Fixed small bug from commit d94f1b252d
(DES.php in line 739-740)
in CFB decrypt() using CRYPT_DES_MODE_MCRYPT and enableContinuousBuffer()
2013-01-21 10:15:13 +07:00
Hans-Jürgen Petrich
2deea8b491
AES: Fixed CFB decrypt() using MODE_MCRYPT and ContinuousBuffer
...
AES: Fixed small bug from commit d94f1b252d
(AES.php in line 425-426)
in CFB decrypt() using CRYPT_AES_MODE_MCRYPT and enableContinuousBuffer()
2013-01-21 10:08:49 +07:00
terrafrost
882e019062
Merge pull request #59 from tamagokun/set_exit_status
...
Get the exit status in ssh
2013-01-20 09:09:45 -08:00
terrafrost
d94f1b252d
AES, DES, RC4, Rijndael, TripleDES: multiple changes
...
- apply petrich's TripleDES / CFB decrypt to AES and DES
- make DES use the updated _generate_xor
- correct a comment typo
2013-01-20 10:11:19 -06:00
Mike Kruk
efdec7b118
Extract the exit_status if given to us from SSH.
2013-01-17 13:47:42 -05:00
Hans-Jürgen Petrich
f7dc23a18e
3DES: Fixed ContinuousBuffer() in CTR/CFB/OFB
...
FIXED: multiple calls to enable/enableContinuousBuffer() work's now in CTR/CFB/OFB
FIXED: "Illegal string offset" and strlen(array()) Warning/Notice
Performance improvement in CFB Mode with enableContinuousBuffer() using MODE_MCRYPT
2013-01-14 21:23:20 +07:00
terrafrost
efe8cc45e5
Merge branch 'petrich'
2013-01-14 01:17:06 -06: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
Hans-Jürgen Petrich
c624c785ee
DES: Fixed CFB/OFB and continuousBuffer
...
FIXED: multiple calls to enable/disableCMode() will work now
FIXED: CFB/OFB modes
FIXED: "Illegal string offset" and strlen(array()) Warning/Notice
2013-01-13 01:48:48 +07:00
terrafrost
bccce5802c
SSH2: Use strlen instead of empty
2013-01-12 10:46:19 -06:00
terrafrost
b8768c8d11
SSH1: Make it so SSH packets spanning multiple TCP/IP packets can be rcvd
2013-01-12 10:45:35 -06:00
terrafrost
bbed0916cd
SSH2: Make $stop be after all network activity
2013-01-11 18:38:38 -06:00
terrafrost
ab7f65d436
SSH1: Added setTimeout()
...
Note that interactiveRead() was left untouched.
2013-01-11 18:36:58 -06:00
terrafrost
76a24dc546
AES: $pos will always be 0 in the last if statement for CFB
2013-01-11 18:09:28 -06:00
terrafrost
7c0926d94a
Merge remote-tracking branch 'origin/petrich'
...
Conflicts:
phpseclib/Crypt/AES.php
2013-01-11 18:06:43 -06:00
terrafrost
74e61deb4f
AES: CFB: decrypted strings were being truncated
2013-01-11 15:30:06 -06:00
terrafrost
d90caa17e3
SSH1: CS adjustments
2013-01-11 00:31:49 -06:00
terrafrost
4a1cbfa7fd
Merge remote-tracking branch 'petrich/patch-3' into petrich
...
Conflicts:
phpseclib/Crypt/AES.php
2013-01-10 23:49:59 -06:00
terrafrost
bbd62f6490
AES: CFB mode fix
2013-01-10 20:42:38 -06:00
terrafrost
5ce9ad6a42
Random: $urandom -> $fp
2013-01-10 13:19:31 -06:00
Hans-Jürgen Petrich
20461866ef
AES: Fix broken CFB and disableContinuousBuffer()
...
Related to: https://github.com/phpseclib/phpseclib/pull/45
2013-01-10 23:27:12 +07:00
terrafrost
46baf1815f
SSH1: Fix E_NOTICE
2013-01-10 00:42:53 -06:00
terrafrost
c3ee632587
SSH1: fix "Expected SSH_SMSG_SUCCESS" error
2013-01-09 23:56:33 -06:00
terrafrost
b1c96faf90
SSH1: Packets shown in log were encrypted
2013-01-09 22:54:11 -06:00