terrafrost
ab489801fe
Tests/RSA: pack expected result
2015-05-31 10:07:18 -05:00
terrafrost
2536d224ee
Tests/RSA: pack expected result
2015-05-31 10:06:13 -05:00
terrafrost
6bce2c79ac
Tests/RSA: re-added accidentally removed $rsa initialization
2015-05-31 09:20:03 -05:00
terrafrost
1316fd45f4
Tests/RSA: use correct constant
2015-05-31 09:17:53 -05:00
terrafrost
1395c0c011
Merge branch 'rsa-none-1.0' into rsa-none-2.0
2015-05-31 02:21:04 -05:00
terrafrost
0166d3a7ec
Tests/RSA: fix error
2015-05-31 02:20:16 -05:00
terrafrost
71104e8120
Merge branch 'rsa-none-1.0' into rsa-none-2.0
...
Conflicts:
tests/Unit/Crypt/RSA/ModeTest.php
2015-05-31 02:19:06 -05:00
terrafrost
26d528855a
Tests/RSA: hard-coded key and result
2015-05-31 02:13:11 -05:00
terrafrost
30260f3321
Merge branch 'rsa-none-1.0' into rsa-none-2.0
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-05-25 22:36:10 -05:00
terrafrost
1d924cfc7b
RSA: add "none" encryption mode
2015-05-25 22:30:38 -05:00
terrafrost
3cb685337a
composer.json: update PHP_Compat requirements
2015-05-24 12:10:12 -05:00
terrafrost
649d469c1c
ANSI: use default namespace for stdClass
2015-05-23 21:01:45 -05:00
terrafrost
6c345acc1d
ANSI: PHP5 updates
2015-05-23 18:23:40 -05:00
terrafrost
e4fee53c93
Merge branch 'ansi-updates-1.0' into ansi-updates-2.0
2015-05-23 18:18:22 -05:00
terrafrost
4f19085e68
Tests: add ANSI unit test
2015-05-23 17:41:16 -05:00
terrafrost
48191bdeec
ANSI: fix typo
2015-05-23 17:39:17 -05:00
terrafrost
2bb70a1c22
ANSI: rendering improvements
2015-05-23 16:51:57 -05:00
terrafrost
cc0420b36b
ANSI: improve vt100 terminal emulation
...
store each coordinate's attributes independently and add support
for a few more escape codes
2015-05-23 11:55:03 -05:00
terrafrost
27c33e5317
Merge pull request #684 from terrafrost/2.0
...
2.0
2015-05-07 08:21:59 -05:00
terrafrost
e3d251ac57
Merge pull request #683 from terrafrost/1.0
...
README: rm codeclimate badge
2015-05-07 08:21:38 -05:00
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