Andreas Fischer
74d0b8ccce
Merge branch 'master' into php5
...
* master:
Updated dependencies
Conflicts:
composer.lock
2014-12-03 12:30:55 +01: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
cd10ded72e
Merge pull request #508 from cnelissen/RandomAsClass
...
Promote Crypt/Random.php to a fully qualified class
* cnelissen/RandomAsClass:
Removed includes for Random.php and fixed up user_error message
Renamed Random::crypt_random_string to Random::string
Regenerated lock file
Namespaced Crypt\Random
Code sniff fix
Initial commit
Conflicts:
composer.lock
2014-12-02 21:56:21 +01:00
Andreas Fischer
946aa08aec
Merge pull request #515 from GrahamCampbell/patch-1
...
Alias the php5 branch as 2.0.x for now
* GrahamCampbell/patch-1:
Alias the php5 branch as 2.0.x for now
2014-12-02 21:50:38 +01:00
Andreas Fischer
885359bf21
Merge branch 'master' into php5
...
* master:
Update squizlabs/php_codesniffer from 1.5.2 to 1.5.5
Update phpunit/phpunit to 4.3.*
Update sami/sami to 2.*
Conflicts:
composer.lock
2014-12-02 21:41:01 +01: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
Graham Campbell
0cbfbbbdf9
Alias the php5 branch as 2.0.x for now
2014-12-02 19:47:06 +00:00
Clint Nelissen
d6029bdb6a
Removed includes for Random.php and fixed up user_error message
2014-12-02 09:34:15 -08:00
Clint Nelissen
f5ed86e385
Renamed Random::crypt_random_string to Random::string
2014-12-02 09:20:40 -08:00
Clint Nelissen
82de57a65f
Regenerated lock file
2014-12-02 08:45:01 -08:00
Clint Nelissen
c70702afbb
Namespaced Crypt\Random
2014-12-02 08:41:30 -08:00
Clint Nelissen
45ed270556
Removed duplicated docblock text
2014-12-02 08:18:43 -08:00
Clint Nelissen
7fe4007053
Removed duplicated docblock text
2014-12-02 08:17:53 -08:00
Clint Nelissen
3129faf05d
Codesniff fix
2014-12-01 19:28:02 -08:00
Clint Nelissen
feca21da2b
Split File_ASN1 and File_ASN1_Element into separate files
2014-12-01 19:26:52 -08:00
Clint Nelissen
b32c05b64e
Split System_SSH_Agent and System_SSH_Agent_Identity into separate files
2014-12-01 19:18:58 -08:00
Clint Nelissen
bc3deb191f
Code sniff fix
2014-12-01 19:01:00 -08:00
Clint Nelissen
9c0c3faeb7
Initial commit
2014-12-01 18:54:44 -08: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
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
terrafrost
e7708b0d20
AES: update unit tests
2014-10-15 17:59:48 -05:00