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