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