danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2024-12-04 02:27:52 +01:00
Code Issues Projects Releases Wiki Activity
1,872 Commits 1 Branch 21 Tags 11 MiB
89cf423c58
Commit Graph

1872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
terrafrost
ca2a762541 Merge branch '2.0' of git://github.com/phpseclib/phpseclib into 2.0 
Conflicts:
	README.md
 2015-05-07 08:19:34 -05:00
terrafrost
4c4c8554a6 Merge branch '1.0' into 2.0 
Conflicts:
	README.md
 2015-05-07 08:19:02 -05:00
terrafrost
ae41aca610 README: rm codeclimate badge 
it's giving us a low score for code who's complexity can't easily be changed
and dinging us for "short variables" that are based on the RFC's of the undyling
encryption algorithms
 2015-05-07 08:16:03 -05:00
terrafrost
e0755e50f4 Merge pull request #681 from terrafrost/booleans-2.0 
Booleans 2.0
 2015-05-07 07:42:15 -05:00
terrafrost
3ca05e3f01 Merge pull request #680 from terrafrost/booleans-1.0 
backport e3betht's PR to 1.0
 2015-05-07 07:41:59 -05:00
terrafrost
23e0b5d86b Merge remote-tracking branch 'e3betht/comparing-booleans' into booleans-2.0 
Conflicts:
	README.md
 2015-05-07 00:31:31 -05:00
terrafrost
ab98a7c30c Merge branch 'booleans-1.0' into booleans-2.0 
Conflicts:
	README.md
 2015-05-07 00:29:33 -05:00
terrafrost
2fee2d4f98 backport e3betht's PR to 1.0 2015-05-07 00:26:39 -05:00
terrafrost
c10344795a Merge pull request #678 from terrafrost/rsa-fingerprint-2.0 
Rsa fingerprint 2.0
 2015-05-06 23:14:55 -05:00
terrafrost
2f1698ee97 Merge pull request #677 from terrafrost/rsa-fingerprint-1.0 
RSA: backport getPublicKeyFingerprint from Lukas-W's PR
 2015-05-06 23:08:55 -05:00
terrafrost
895caa706d Merge remote-tracking branch 'lukas/fingerprint' into rsa-fingerprint-2.0 
Conflicts:
	phpseclib/Crypt/RSA.php
	tests/Unit/Crypt/RSA/LoadKeyTest.php
 2015-05-06 23:06:07 -05:00
terrafrost
c1d47856c8 Merge branch 'rsa-fingerprint-1.0' into rsa-fingerprint-2.0 2015-05-06 23:02:12 -05:00
terrafrost
f19bf7a07d RSA: backport getPublicKeyFingerprint from Lukas-W's PR 2015-05-06 22:55:12 -05:00
Lukas W
10d88c9c17 RSA fingerprint: Fix missing md5 2015-05-06 08:27:15 +02:00
Andreas Fischer
8e2f694129 Merge branch '1.0' into 2.0 
* 1.0:
  SSH2: string shift by 4 instead of by 1
  SSH2: fix E_NOTICE involving global requests
 2015-05-05 16:14:12 +02:00
Andreas Fischer
5bd7a73a71 Merge pull request #674 from terrafrost/ssh2-global-request 
fix E_NOTICE with SSH2 global requests

* terrafrost/ssh2-global-request:
  SSH2: string shift by 4 instead of by 1
  SSH2: fix E_NOTICE involving global requests
 2015-05-05 16:14:12 +02:00
Lukas W
c46890b00c RSA fingerprint feature fix 
Proper Hash usage, PHP 4 compatibility
 2015-05-05 08:51:17 +02:00
terrafrost
684d6eed0e SSH2: string shift by 4 instead of by 1 2015-05-04 08:22:27 -05:00
Lukas W
a67f4df164 RSA: Add support for calculating a public key's fingerprint 2015-05-04 09:21:37 +02:00
Andreas Fischer
e40bbb12a3 Merge branch '2.0' 
* 2.0:
  Replace ; with : in case statement.
 2015-05-03 14:14:02 +02:00
Andreas Fischer
661f3ce3b9 Merge branch '1.0' into 2.0 
* 1.0:
  Replace ; with : in case statement.

Conflicts:
	phpseclib/Net/SFTP.php
	phpseclib/Net/SSH2.php
 2015-05-03 14:13:56 +02:00
Andreas Fischer
8893f8f53e Merge pull request #671 from bantu/case-with-semicolon 
Replace ; with : in case statement.

* bantu/case-with-semicolon:
  Replace ; with : in case statement.
 2015-05-03 14:12:44 +02:00
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