Andreas Fischer
d6c210984c
Use assertArrayNotHasKey().
2014-12-05 00:18:45 +01:00
Andreas Fischer
262da528a0
Merge pull request #527 from DavidAnderson684/patch-2
...
Quote shell argument with escapeshellarg()
* DavidAnderson684/patch-2:
Quote shell argument with escapeshellarg()
2014-12-04 20:00:41 +01:00
Andreas Fischer
067699bce2
Merge pull request #528 from bantu/scp-case
...
SCP: Add missing space after case statement.
* bantu/scp-case:
SCP: Add missing space after case statement.
2014-12-04 19:56:29 +01:00
Andreas Fischer
f2a08f7b6c
Some tests for crypt_random_string().
2014-12-04 19:23:22 +01:00
Andreas Fischer
f40bb9190f
SCP: Add missing space after case statement.
2014-12-04 18:42:47 +01:00
David Anderson
14dc468b70
Quote shell argument with escapeshellarg()
...
Currently, the call to "scp -t" or "scp -f" just uses naive quoting - i.e. a couple of quote marks are thrown in.
But, this can easily be escaped from - if the filename has a quote mark of its own in it, for example.
e.g. if the filename is as follows, then bad things will happen:
";rm -rf /
Instead, escapeshellarg should be used, to make sure it gets escaped properly.
2014-12-04 16:50:23 +00:00
Andreas Fischer
630a71bee6
Merge pull request #522 from DavidAnderson684/patch-1
...
Avoid calling fclose(false)
* DavidAnderson684/patch-1:
Avoid calling fclose(false)
2014-12-03 23:08:51 +01:00
David Anderson
647a1e9a5e
Avoid calling fclose(false)
...
The previous code would always call fclose(false) if the file was not successfully opened - resulting in a PHP notice.
2014-12-03 19:29:46 +00:00
Andreas Fischer
bce3c02126
Merge pull request #517 from GrahamCampbell/deps
...
Updated dependencies
* GrahamCampbell/deps:
Updated dependencies
2014-12-03 12:30:12 +01:00
Graham Campbell
91511b7c5c
Updated dependencies
2014-12-02 21:25:47 +00:00
Andreas Fischer
6445e58bc0
Merge pull request #516 from bantu/dev-deps-update
...
Update development dependencies
* bantu/dev-deps-update:
Update squizlabs/php_codesniffer from 1.5.2 to 1.5.5
Update phpunit/phpunit to 4.3.*
Update sami/sami to 2.*
2014-12-02 21:39:41 +01:00
Andreas Fischer
420653a0a6
Update squizlabs/php_codesniffer from 1.5.2 to 1.5.5
2014-12-02 21:27:35 +01:00
Andreas Fischer
cd6e50bfb9
Update phpunit/phpunit to 4.3.*
2014-12-02 21:23:58 +01:00
Andreas Fischer
a71ace33ad
Update sami/sami to 2.*
2014-12-02 21:23:40 +01:00
terrafrost
129dc320b0
Crypt_Base: fix the rest of the E_NOTICEs
2014-11-29 22:26:42 -06:00
terrafrost
6c09d6f565
Crypt_Base: fix E_NOTICEs
2014-11-29 16:18:17 -06:00
terrafrost
866b690248
Crypt: CS adjustments
2014-11-29 09:52:14 -06:00
terrafrost
8476ae6383
Crypt_Base: openssl_(en|de)crypt's parameters changed in PHP 5.4.0
2014-11-29 09:48:45 -06:00
terrafrost
8fc4f4b70c
Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support
2014-11-29 07:46:06 -06:00
terrafrost
f6e0c4b506
Crypt: add OpenSSL support
...
aside from the addition of OpenSSL support a few other changes have been included:
- setEngine(), as added by petrich, is depricated (not that it was ever in trunk to begin with)
it has been replaced with isValidEngine() and setPreferredEngine().
- replace _generate_xor() with increment_str()
_increment_str() had extra functionality that wasn't being used. ie. it could concatenate
multiple successive string increments to one another automatically. but not only was that
functionality not used - it also made the function less versatile. _increment_str() can be
used more easily for iterative brute forcing (for example)
- rename Crypt_Base::_stringShift to Crypt_Base::_string_shift (for consistency)
- more expansive unit test coverage
2014-11-29 07:39:21 -06: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
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
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
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
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
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
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
terrafrost
e7708b0d20
AES: update unit tests
2014-10-15 17:59:48 -05:00
Andreas Fischer
5b932495cc
SFTP: Replace incorrect comment about filesize. There is no 4 GiB limit.
2014-10-15 17:27:48 +02:00
terrafrost
c8b55b8929
Rijndael: calling $rijndael->setEngine() didn't have any effect
...
(CRYPT_RIJNDAEL_MODE constant was always over-riding it)
2014-10-12 00:52:52 -05:00
terrafrost
361b59fff9
SSH2: make setCryptoEngine() less cumbersome
2014-10-11 23:40:56 -05:00
terrafrost
959c0cefae
SSH2: add setCryptoEngine() function
2014-10-11 23:26:46 -05:00
terrafrost
ff4d563f4f
SSH2: CS adjustments
2014-10-11 23:20:44 -05:00
terrafrost
beb3d0db79
Merge remote-tracking branch 'petrich/master' into petrich
...
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
2014-10-11 22:56:32 -05: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
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
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
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
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