Andreas Fischer
143488bf75
Merge branch '1.0' into 2.0
...
* 1.0:
support for callback function for SFTP::put function - in order to pipe data directly to remote server without putting it into file or keeping in memory. This can be useful particularly for dumping big databases directly to remote server.
Conflicts:
phpseclib/Net/SFTP.php
2015-05-03 00:54:22 +02:00
terrafrost
36ef1c4084
Merge remote-tracking branch 'audrey/sftp-put-callback' into 2.0
2015-04-16 07:45:39 -05:00
terrafrost
1d772c3a6f
Merge remote-tracking branch 'audrey/sftp-put-callback-for-1.0' into 1.0
2015-04-16 07:45:24 -05:00
terrafrost
d00e20a140
Merge remote-tracking branch 'graham/1.0-phpdoc' into 2.0-phpdoc
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Net/SCP.php
tests/Unit/File/ASN1Test.php
2015-04-16 00:42:53 -05:00
terrafrost
9f626c67b6
Merge remote-tracking branch 'graham/1.0-phpdoc' into 1.0-phpdoc
2015-04-16 00:31:54 -05:00
terrafrost
ca0b56f05c
Merge branch '1.0' into 2.0
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Net/SFTP.php
2015-04-15 23:56:09 -05:00
terrafrost
b47813cf47
Merge remote-tracking branch 'DavidAnderson84/patch-4' into 1.0
2015-04-15 23:52:00 -05:00
andrey012
26086789ef
replace throw with user_error()
2015-04-15 03:35:08 +03:00
andrey012
16430d4d2e
support for callback function for SFTP::put function - in order to pipe data directly to remote server without putting it into file or keeping in memory. This can be useful particularly for dumping big databases directly to remote server.
2015-04-15 03:29:01 +03:00
Andrey Grinenko
b5e80bc176
cosmetics
2015-04-11 11:34:41 +03:00
terrafrost
047a75a636
Merge branch '2.0' of https://github.com/phpseclib/phpseclib into openssl-support-2.0
2015-04-10 23:08:08 -05:00
Andreas Fischer
13a183d1af
Merge pull request #657 from terrafrost/ssh2-mask-fix
...
SSH2: NET_SSH2_MASK_* -> self::MASK_*
* terrafrost/ssh2-mask-fix:
SSH2: NET_SSH2_MASK_* -> self::MASK_*
2015-04-11 01:22:24 +02:00
terrafrost
0b1d3aa7e9
SSH2: NET_SSH2_MASK_* -> self::MASK_*
2015-04-10 17:48:58 -05:00
Andrey Grinenko
e58427221d
support for callback function for SFTP::put function - in order to pipe data directly to remote server without putting it into file or keeping in memory. This can be useful particularly for dumping big databases directly to remote server.
2015-04-09 02:59:00 +03:00
terrafrost
0835389b5a
CS adjustments
2015-04-02 22:39:47 -05:00
terrafrost
188cef4665
Tests/DES: method is testing decryption - not encryption
2015-04-02 22:20:02 -05:00
terrafrost
46d22b962d
yet another typo in unit test
2015-04-02 07:07:58 -05:00
terrafrost
f5f714b197
Merge branch 'openssl-support' of https://github.com/terrafrost/phpseclib into openssl-support
2015-04-02 07:05:10 -05:00
terrafrost
adad5fa157
Crypt/*: update some docblock comments
2015-04-02 07:04:02 -05:00
terrafrost
c42d8382dd
Crypt/Base: CRYPT_MODE -> self::MODE
2015-04-02 07:01:37 -05:00
terrafrost
c274370ed9
another typo
2015-04-02 06:50:55 -05:00
terrafrost
4c8a56f2ad
Tests: more typos
2015-04-02 06:43:33 -05:00
terrafrost
1fa4734acd
Tests/Blowfish - fix typo
2015-04-02 06:31:36 -05:00
terrafrost
a530152628
Crypt/Base: fix syntax errors
2015-04-02 06:23:54 -05:00
terrafrost
87e0f05ada
Merge branch 'openssl-support' of https://github.com/terrafrost/phpseclib into openssl-support
2015-04-02 05:58:58 -05:00
terrafrost
d75f703c0a
rm PHP v4 compatability claim
2015-04-02 05:57:52 -05:00
terrafrost
56d6d5dcb0
Crypt/Base: fix syntax error
2015-04-02 05:54:00 -05:00
terrafrost
e510dc878b
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into openssl-support
...
Conflicts:
phpseclib/Net/SSH2.php
2015-04-02 05:40:14 -05:00
terrafrost
023fef8d8b
Merge branch '2.0' of https://github.com/phpseclib/phpseclib into openssl-support-2.0
...
Conflicts:
phpseclib/Net/SSH2.php
2015-04-02 05:37:04 -05:00
terrafrost
ebcb3130b7
Merge branch 'openssl-support' into 2.0
...
Conflicts:
phpseclib/Crypt/AES.php
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/RC2.php
phpseclib/Crypt/RC4.php
phpseclib/Crypt/Rijndael.php
phpseclib/Crypt/TripleDES.php
phpseclib/Crypt/Twofish.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPLargeFileTest.php
tests/Unit/Crypt/AES/InternalTest.php
tests/Unit/Crypt/AES/McryptTest.php
tests/Unit/Crypt/AES/TestCase.php
2015-04-02 05:32:31 -05:00
terrafrost
e9fe245132
Crypt/Base: update some comments
2015-03-30 23:43:28 -05:00
terrafrost
1a51226d84
Crypt/Base; prioritize OpenSSL over mcrypt
2015-03-30 23:33:52 -05:00
Andreas Fischer
41f2660136
Merge branch '2.0'
...
* 2.0:
SSH2: rm unused $connectionTimeout variable
SSH2: rm redundant code and make php4 compatable
SSH2: timeout improvements
2015-03-30 12:47:10 +02:00
Andreas Fischer
8101772ab4
Merge branch '1.0' into 2.0
...
* 1.0:
SSH2: rm unused $connectionTimeout variable
SSH2: rm redundant code and make php4 compatable
SSH2: timeout improvements
Conflicts:
phpseclib/Net/SSH2.php
2015-03-30 12:46:54 +02:00
Andreas Fischer
c0370ee91d
Merge pull request #639 from terrafrost/banner-timeout
...
improve error handling with protocol version exchange
* terrafrost/banner-timeout:
SSH2: rm unused $connectionTimeout variable
SSH2: rm redundant code and make php4 compatable
SSH2: timeout improvements
2015-03-30 12:37:46 +02:00
Andreas Fischer
ca7b542b6f
Merge branch '2.0'
...
* 2.0:
SSH2: missed a file in the merge
removed unwarrented user_error
preference isset over array_key_exists, return false on failure, break after return channel opened
moved agent forwarding channel handling to filter method and reusing existing open channels to request forwarding
removed stopSSHForwarding
determining what failure to expect
addresses low hanging fruit comments from terrafrost and bantu
removed superfluous default case
SSH agent forwarding implementation
2015-03-30 12:25:19 +02:00
Andreas Fischer
0e17af416c
Merge branch '1.0' into 2.0
...
* 1.0:
2015-03-30 12:23:13 +02:00
Andreas Fischer
28a2f0fc0c
Merge pull request #648 from terrafrost/agentforwarding-2.0-1
...
Agent Forwarding for 2.0 branch
* terrafrost/agentforwarding-2.0-1:
SSH2: missed a file in the merge
removed unwarrented user_error
preference isset over array_key_exists, return false on failure, break after return channel opened
moved agent forwarding channel handling to filter method and reusing existing open channels to request forwarding
removed stopSSHForwarding
determining what failure to expect
addresses low hanging fruit comments from terrafrost and bantu
removed superfluous default case
SSH agent forwarding implementation
2015-03-30 12:23:10 +02:00
Andreas Fischer
6dc32808f1
Merge pull request #644 from terrafrost/agentforwarding-1.0
...
Agent Forwarding for 1.0 branch
* terrafrost/agentforwarding-1.0:
removed unwarrented user_error
preference isset over array_key_exists, return false on failure, break after return channel opened
moved agent forwarding channel handling to filter method and reusing existing open channels to request forwarding
removed stopSSHForwarding
determining what failure to expect
addresses low hanging fruit comments from terrafrost and bantu
removed superfluous default case
SSH agent forwarding implementation
2015-03-30 12:22:57 +02:00
terrafrost
6bd4e6018e
Crypt/Base: rm redundant null padding
2015-03-29 15:26:15 -05:00
Graham Campbell
e50cbacd4e
Fixed some phpdocs
2015-03-29 17:07:17 +01:00
terrafrost
33645f5297
SSH2: missed a file in the merge
2015-03-29 10:58:05 -05:00
terrafrost
a8e702b34f
Merge branch 'agentforwarding-1.0' into agentforwarding-2.0
...
Conflicts:
phpseclib/Net/SSH2.php
phpseclib/System/SSH/Agent.php
2015-03-29 10:32:30 -05:00
terrafrost
bb01002233
Merge remote-tracking branch 'agentforwarding/feature/ssh_agent_forwarding' into agentforwarding-1.0
2015-03-28 21:03:17 -05:00
terrafrost
1294b08675
SSH2: rm unused $connectionTimeout variable
2015-03-27 22:32:38 -05:00
montdidier
3ff4212b92
removed unwarrented user_error
2015-03-24 13:40:42 +08:00
montdidier
9723acc885
preference isset over array_key_exists, return false on failure, break after return channel opened
2015-03-24 13:38:56 +08:00
Andreas Fischer
cae37aeef3
Merge pull request #642 from terrafrost/des-self-fix
...
DES: fix fatal error that could occur under special circumstances
* terrafrost/des-self-fix:
DES: fix fatal error that could occur under special circumstances
2015-03-21 17:54:27 +01:00
Andreas Fischer
b70ed2e860
Merge branch '2.0'
...
* 2.0:
DES: fix fatal error that could occur under special circumstances
2015-03-21 17:54:27 +01:00
terrafrost
4ba8c24c13
DES: fix fatal error that could occur under special circumstances
2015-03-21 11:01:43 -05:00
