octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-09-19 19:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,850 Commits 4 Branches 121 Tags 19 MiB
4e5ca26342
Commit Graph

1850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
5d2590feb0 Replace ; with : in case statement. 2015-05-03 13:18:23 +02:00
Andreas Fischer
be8d7d3467 Merge branch '2.0' 
* 2.0:
  callbacks - two PRs conflict sorted out. First one: e9b698fd65, fba6894474, 1cd286642e Second one: 16430d4d2e, 0cc6125f87
  documentation fix
  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-05-03 01:11:09 +02:00
Andreas Fischer
daaa931dc2 Merge branch '1.0' into 2.0 
* 1.0:
  callbacks - two PRs conflict sorted out. First one: e9b698fd65, fba6894474, 1cd286642e Second one: 16430d4d2e, 0cc6125f87
  documentation fix

Conflicts:
	phpseclib/Net/SFTP.php
 2015-05-03 01:10:53 +02:00
Andreas Fischer
ee3eb2071d Merge pull request #672 from andrey012/sftp-put-callback-for-1.0 
Fix callback parameter conflicts of SFTP put() method.

* andrey012/sftp-put-callback-for-1.0:
  callbacks - two PRs conflict sorted out. First one: e9b698fd65, fba6894474, 1cd286642e Second one: 16430d4d2e, 0cc6125f87
  documentation fix
 2015-05-03 01:02:50 +02:00
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
andrey012
e7719f765c callbacks - two PRs conflict sorted out. 
First one: e9b698fd65, fba6894474, 1cd286642e
Second one: 16430d4d2e, 0cc6125f87
 2015-05-02 15:27:57 +03:00
andrey012
f4a93c790f Merge branch '1.0' into sftp-put-callback-for-1.0 2015-05-02 15:24:31 +03:00
andrey012
0cc6125f87 documentation fix 2015-05-02 14:28:19 +03:00
terrafrost
b59d821bbe SSH2: fix E_NOTICE involving global requests 2015-04-30 21:34:07 -05:00
e3betht
62217a08df Using the identical operator for Boolean comparisons 2015-04-27 11:23:05 -05:00
terrafrost
1b22d523dc Merge remote-tracking branch 'audrey/sftp-put-callback' 2015-04-16 07:45:51 -05: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
8936593317 Merge branch '2.0-phpdoc' 2015-04-16 00:54:23 -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
8d7099a23c Merge branch '2.0-callback' 2015-04-16 00:23:37 -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
0aa8d2e11e Merge branch 'master' of https://github.com/phpseclib/phpseclib 2015-04-10 23:12:14 -05:00
terrafrost
5304afd5c1 Merge branch 'openssl-support-2.0' 2015-04-10 23:08:29 -05: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
c0748ea87f Merge branch '2.0' 
* 2.0:
  SSH2: NET_SSH2_MASK_* -> self::MASK_*
 2015-04-11 01:22:24 +02: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