Graham Campbell
0cbfbbbdf9
Alias the php5 branch as 2.0.x for now
2014-12-02 19:47:06 +00:00
Andreas Fischer
43d2e9ef68
Merge branch 'master' into php5
...
* master:
SSH2: clarify exec() docblock comment
2014-11-20 10:58:33 +01:00
Andreas Fischer
c0511f2df4
Merge pull request #503 from terrafrost/bug501
...
SSH2: clarify exec() docblock comment
* terrafrost/bug501:
SSH2: clarify exec() docblock comment
2014-11-20 10:58:23 +01:00
terrafrost
b1e6643032
SSH2: clarify exec() docblock comment
2014-11-19 22:38:19 -06:00
Andreas Fischer
7030e8502b
Merge branch 'master' into php5
...
* master:
update download version in README.me
add CHANGELOG.md
2014-11-14 00:35:35 +01:00
terrafrost
c6e88ca6e8
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2014-11-09 21:08:59 -06:00
terrafrost
76c1c6607f
update download version in README.me
2014-11-09 21:08:08 -06:00
terrafrost
860ba065c4
add CHANGELOG.md
2014-11-09 20:30:27 -06:00
Andreas Fischer
10e5653324
Merge branch 'master' into php5
...
* master:
SSH2: fix issues with RSA key verification
Conflicts:
phpseclib/Net/SSH2.php
2014-11-07 13:13:38 +01:00
Andreas Fischer
e540752e9a
Merge pull request #500 from terrafrost/ssh-rsa-fix
...
SSH2: fix issues with RSA key verification
* terrafrost/ssh-rsa-fix:
SSH2: fix issues with RSA key verification
2014-11-07 13:08:53 +01:00
terrafrost
3eac2582d6
SSH2: fix issues with RSA key verification
...
Sometimes SSH servers will null pad their RSA keys. this null padding
broke Net/SSH2.php's RSA implementation (Crypt/RSA.php's implementation
works just fine). Also, the -3 was counting the initial "\0" of $h
twice so adjust it to -2.
2014-11-06 11:58:03 -06:00
Andreas Fischer
8af52e2954
Merge branch 'master' into php5
...
* master:
SFTP: Use hexdec() and bin2hex() for filesize calculation.
2014-10-19 21:32:23 +02:00
Andreas Fischer
e63fe3fbdf
Merge pull request #494 from bantu/sftp-filesize-hexdec
...
SFTP: Use hexdec() and bin2hex() for filesize calculation.
* bantu/sftp-filesize-hexdec:
SFTP: Use hexdec() and bin2hex() for filesize calculation.
2014-10-19 21:32:18 +02:00
Andreas Fischer
d494cc5100
Merge branch 'master' into php5
...
* master:
SFTP: Add truncate() to size() test for files larger than 4 GiB.
2014-10-19 21:07:47 +02:00
Andreas Fischer
de9bd70df6
Merge pull request #490 from bantu/sftp-large-files
...
SFTP: Add truncate() to size() test for files larger than 4 GiB.
* bantu/sftp-large-files:
SFTP: Add truncate() to size() test for files larger than 4 GiB.
2014-10-19 21:07:43 +02:00
Andreas Fischer
5c3058cc4b
SFTP: Use hexdec() and bin2hex() for filesize calculation.
2014-10-19 21:07:12 +02:00
Andreas Fischer
45ce4b24ef
Merge branch 'master' into php5
...
* master:
SFTP: Replace incorrect comment about filesize. There is no 4 GiB limit.
Conflicts:
phpseclib/Net/SFTP.php
2014-10-19 20:54:50 +02:00
Andreas Fischer
1b57990e94
Merge pull request #492 from bantu/sftp-large-file-comment
...
SFTP: Replace incorrect comment about filesize. There is no 4 GiB limit.
* bantu/sftp-large-file-comment:
SFTP: Replace incorrect comment about filesize. There is no 4 GiB limit.
2014-10-19 20:53:09 +02:00
Andreas Fischer
6182a64394
SFTP: Add truncate() to size() test for files larger than 4 GiB.
2014-10-19 20:52:40 +02:00
Andreas Fischer
0e38dc4951
Merge branch 'master' into php5
...
* master:
Restore compatibility with PHP 5.6.1 by using explicit array indexes.
2014-10-19 20:46:15 +02:00
Andreas Fischer
1f28502828
Merge pull request #493 from bantu/fix-491
...
Restore compatibility with PHP 5.6.1 by using explicit array index.
* bantu/fix-491:
Restore compatibility with PHP 5.6.1 by using explicit array indexes.
2014-10-19 20:46:07 +02:00
Andreas Fischer
ad03d84461
Restore compatibility with PHP 5.6.1 by using explicit array indexes.
...
This seems to be caused by the resolution of PHP Ticket 67985.
2014-10-19 20:24:13 +02:00
Andreas Fischer
5b932495cc
SFTP: Replace incorrect comment about filesize. There is no 4 GiB limit.
2014-10-15 17:27:48 +02:00
Andreas Fischer
e682e20df4
Merge branch 'master' into php5
...
* master:
Correct constant: NET_SFTP_BLOCK_DEVICE -> NET_SFTP_TYPE_BLOCK_DEVICE
2014-10-09 23:51:33 +02:00
Andreas Fischer
564c678df5
Merge pull request #487 from bantu/fix-486
...
Correct constant: NET_SFTP_BLOCK_DEVICE -> NET_SFTP_TYPE_BLOCK_DEVICE
* bantu/fix-486:
Correct constant: NET_SFTP_BLOCK_DEVICE -> NET_SFTP_TYPE_BLOCK_DEVICE
2014-10-09 23:51:28 +02:00
Andreas Fischer
ce3cf60b10
Correct constant: NET_SFTP_BLOCK_DEVICE -> NET_SFTP_TYPE_BLOCK_DEVICE
2014-10-09 23:24:30 +02:00
Andreas Fischer
645c16d0f5
Merge branch 'master' into php5
...
* master:
Fix Net_SFTP::filetype() block device recognition.
2014-10-09 23:19:23 +02:00
Andreas Fischer
3826ef608a
Merge pull request #486 from vvolodko/patch-1
...
Fix Net_SFTP::filetype() block device recognition.
* vvolodko/patch-1:
Fix Net_SFTP::filetype() block device recognition.
2014-10-09 23:19:15 +02:00
Vladimir Volodko
6715c41e1f
Fix Net_SFTP::filetype() block device recognition.
2014-10-09 12:46:58 +07:00
Andreas Fischer
92c3127448
Merge branch 'master' into php5
...
* master:
SSH2: removed redundant rtrim
2014-09-28 12:43:54 +02:00
Andreas Fischer
c2be2b5a3b
Merge pull request #483 from cezarykluczynski/ssh2-rtrim-strip
...
SSH2: removed redundant rtrim
* cezarykluczynski/ssh2-rtrim-strip:
SSH2: removed redundant rtrim
2014-09-28 12:43:49 +02:00
Cezary Kluczyński
0692a1ea7d
SSH2: removed redundant rtrim
2014-09-28 12:39:54 +02:00
Andreas Fischer
da02246cc4
Merge branch 'master' into php5
...
* master:
BigInteger: accomodate GMP change in PHP 5.6
2014-09-27 22:57:59 +02:00
Andreas Fischer
b6b0b2dec8
Merge pull request #482 from terrafrost/gmp-56
...
BigInteger: accommodate GMP change in PHP 5.6
* terrafrost/gmp-56:
BigInteger: accomodate GMP change in PHP 5.6
2014-09-27 22:57:49 +02:00
terrafrost
a43dd38365
BigInteger: accomodate GMP change in PHP 5.6
2014-09-27 12:52:54 -05:00
Andreas Fischer
eff5f64560
Merge branch 'master' into php5
...
* master:
ASN1: fix unit test
ASN1: add unit test for non-constructed context-specific change
ASN1: fix issue with non-constructed context-specific tags
README: update download link to 0.3.8
2014-09-24 16:50:12 +02:00
Andreas Fischer
ba5101e77b
Merge pull request #480 from terrafrost/asn1-fix
...
ASN1: fix issue with non-constructed context-specific tags
* terrafrost/asn1-fix:
ASN1: fix unit test
ASN1: add unit test for non-constructed context-specific change
ASN1: fix issue with non-constructed context-specific tags
2014-09-24 16:50:03 +02:00
terrafrost
3785bebcce
ASN1: fix unit test
2014-09-24 00:07:49 -05:00
terrafrost
a2f4a2cbba
ASN1: add unit test for non-constructed context-specific change
2014-09-22 23:03:06 -05:00
terrafrost
c6ad2b69ba
ASN1: fix issue with non-constructed context-specific tags
2014-09-22 01:01:34 -05:00
terrafrost
5085202f1f
README: update download link to 0.3.8
2014-09-12 21:42:45 -05:00
Andreas Fischer
5fa5a137dc
Merge branch 'master' into php5
...
* master:
RSA: syntax error in unit tests
RSA: make unit tests perform string comparisons sans white space chars
RSA: update unit test
RSA: add unit test
RSA: make XML keys use unsigned integers
2014-09-09 16:42:07 +02:00
Andreas Fischer
3f3b9b90fb
Merge pull request #469 from terrafrost/rsa-xml-unsigned
...
RSA: make XML keys use unsigned integers
* terrafrost/rsa-xml-unsigned:
RSA: syntax error in unit tests
RSA: make unit tests perform string comparisons sans white space chars
RSA: update unit test
RSA: add unit test
RSA: make XML keys use unsigned integers
2014-09-09 16:41:58 +02:00
terrafrost
f6bd3542b3
RSA: syntax error in unit tests
2014-09-09 00:43:28 -05:00
terrafrost
e092733808
RSA: make unit tests perform string comparisons sans white space chars
2014-09-09 00:34:41 -05:00
terrafrost
c489852332
RSA: update unit test
2014-09-09 00:28:38 -05:00
terrafrost
4329015629
RSA: add unit test
2014-09-08 22:26:14 -05:00
Andreas Fischer
8c42f386f2
Merge pull request #472 from bantu/php5-ssh1-math-biginteger
...
SSH1: Math_BigInteger is supposed to be BigInteger.
* bantu/php5-ssh1-math-biginteger:
SSH1: Math_BigInteger is supposed to be BigInteger.
2014-09-07 22:39:05 +02:00
Andreas Fischer
e85321959e
SSH1: Math_BigInteger is supposed to be BigInteger.
2014-09-07 22:26:22 +02:00
Andreas Fischer
cf921a347a
Merge branch 'master' into php5
...
* master:
SSH2: rm unused constant
2014-09-07 12:43:27 +02:00