terrafrost
0e3fdec56b
Merge branch 'getkeylength' into getkeylength-2.0-2
2015-10-12 22:53:59 -05:00
terrafrost
5f1ff099da
Crypt/Base: one more cs update
2015-10-12 22:52:56 -05:00
terrafrost
49393d1b3a
Merge branch 'getkeylength' into getkeylength-2.0-2
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Rijndael.php
2015-10-04 21:38:47 -05:00
terrafrost
d91158f6ef
rename key_size -> key_length
2015-10-04 21:06:17 -05:00
terrafrost
26a0a0890c
Merge branch 'getkeylength' into getkeylength-2.0-2
...
Conflicts:
phpseclib/Crypt/RC2.php
phpseclib/Crypt/TripleDES.php
2015-10-04 16:40:15 -05:00
terrafrost
27034825f3
cs changes per bantu
2015-10-04 16:29:48 -05:00
terrafrost
1f47daede7
Merge branch 'getkeylength' into getkeylength-2.0-2
2015-09-24 09:29:56 -05:00
terrafrost
8691035228
Crypt/Base: add getBlockLength() method
2015-09-24 09:29:00 -05:00
terrafrost
604dddc82b
Merge branch 'getkeylength' into getkeylength-2.0-2
...
Conflicts:
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
2015-09-22 21:26:00 -05:00
terrafrost
bfba3db1a7
Crypt: make it so the key length can be explicitly set for all ciphers
2015-09-20 12:24:06 -05:00
Andreas Fischer
bff8e3093f
Merge pull request #822 from GrahamForks/readme-2
...
[2.0] Fixed readme links
* GrahamForks/readme-2:
Fixed readme
2015-09-16 13:41:09 +02:00
Andreas Fischer
aef80c4182
Merge branch '1.0' into 2.0
...
* 1.0:
Fixed readme links
Conflicts:
README.md
2015-09-16 13:41:01 +02:00
Andreas Fischer
34f581554a
Merge pull request #821 from GrahamForks/readme
...
[1.0] Fixed readme links
* GrahamForks/readme:
Fixed readme links
2015-09-16 13:40:37 +02:00
Andreas Fischer
95ccad70ee
Merge pull request #820 from GrahamForks/phpdoc
...
[2.0 Fixed phpdoc
* GrahamForks/phpdoc:
Fixed phpdoc
2015-09-16 13:34:55 +02:00
Andreas Fischer
cb0f1a57e6
Merge branch '1.0' into 2.0
...
* 1.0:
Composer: add GrahamCampbell to composer.json
AUTHORS: add GrahamCampbell
Conflicts:
composer.lock
2015-09-16 13:31:01 +02:00
Andreas Fischer
b48a01ec00
Merge pull request #824 from terrafrost/new-author
...
AUTHORS: add GrahamCampbell
* terrafrost/new-author:
Composer: add GrahamCampbell to composer.json
AUTHORS: add GrahamCampbell
2015-09-16 13:29:41 +02:00
terrafrost
fae274f9c9
Composer: add GrahamCampbell to composer.json
2015-09-15 19:12:57 -05:00
terrafrost
7b0b111fcd
AUTHORS: add GrahamCampbell
2015-09-15 13:23:52 -05:00
Graham Campbell
7d11c830ce
Fixed readme
2015-09-15 17:30:33 +01:00
Graham Campbell
783a07fecd
Fixed readme links
2015-09-15 17:28:41 +01:00
Graham Campbell
7f1bbfe216
Fixed phpdoc
2015-09-14 16:30:31 +01:00
Andreas Fischer
970398f341
Merge pull request #819 from bantu/travis-php7-nofail
...
No longer allow Travis CI to fail on PHP 7.
* bantu/travis-php7-nofail:
No longer allow Travis CI to fail on PHP 7.
2015-09-14 15:25:14 +02:00
Andreas Fischer
ffc8107a12
No longer allow Travis CI to fail on PHP 7.
2015-09-14 14:09:56 +02:00
Andreas Fischer
6f6ec7f13a
Merge branch '1.0' into 2.0
...
* 1.0:
2015-09-14 14:07:38 +02:00
Andreas Fischer
4d8388d5d0
Merge pull request #818 from terrafrost/php7-2.0
...
BigInteger: fix PHP7 error for 2.0 branch
* terrafrost/php7-2.0:
BigInteger: fix PHP7 error
2015-09-14 14:07:34 +02:00
Andreas Fischer
4c7a2b5d73
Merge pull request #817 from terrafrost/php7
...
BigInteger: fix PHP7 error
* terrafrost/php7:
BigInteger: fix PHP7 error
2015-09-14 14:07:24 +02:00
terrafrost
3f7b3b393e
Merge branch 'php7' into 2.0
...
Conflicts:
phpseclib/Math/BigInteger.php
2015-09-13 19:15:13 -05:00
terrafrost
833da775b6
BigInteger: fix PHP7 error
...
$x = gmp_init(6); empty($x); demonstrates the problem
2015-09-13 19:13:31 -05:00
Andreas Fischer
2986ea9d6d
Merge pull request #816 from terrafrost/small-tweaks
...
small CS changes
* terrafrost/small-tweaks:
small CS changes
2015-09-14 01:30:54 +02:00
Andreas Fischer
4387b64426
Merge branch '1.0' into 2.0
...
* 1.0:
Fixed another case
Minor tweaks
Fixed error
More fixes
PHPDoc fixes
Conflicts:
phpseclib/Crypt/Random.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
2015-09-14 01:27:04 +02:00
Andreas Fischer
71d7108d9a
Merge pull request #810 from GrahamForks/cs
...
PHPDoc Fixes And Others
* GrahamForks/cs:
Fixed another case
Minor tweaks
Fixed error
More fixes
PHPDoc fixes
2015-09-14 01:18:09 +02:00
terrafrost
8b8d7a5dcd
small CS changes
2015-09-13 18:13:35 -05:00
Graham Campbell
010c1285ba
Fixed another case
2015-09-06 23:05:41 +01:00
Graham Campbell
b1db7f05d9
Minor tweaks
2015-09-06 23:01:03 +01:00
Graham Campbell
06a1d3d981
Fixed error
2015-09-06 22:19:34 +01:00
Graham Campbell
eec8c9cb5d
More fixes
2015-09-06 12:39:14 +01:00
Graham Campbell
dd031a1702
PHPDoc fixes
2015-09-06 12:28:08 +01:00
Andreas Fischer
09ac065459
Merge branch '1.0' into 2.0
...
* 1.0:
Typo in variable name
2015-09-05 18:14:03 +02:00
Andreas Fischer
4f11a517bf
Merge pull request #808 from lem9/1.0
...
Typo in variable name
* lem9/1.0:
Typo in variable name
2015-09-05 18:14:02 +02:00
Marc Delisle
01e7c65f07
Typo in variable name
2015-09-05 12:13:11 -04:00
Andreas Fischer
864493bbf6
Merge pull request #790 from cweagans/switch-to-extension-loaded-2.0
...
Switch to extension loaded (2.0)
* cweagans/switch-to-extension-loaded-2.0:
Remove conditions for PHP < 5.3.0 for this branch
Switch to extension_loaded('gmp')
Switch to extension_loaded instead of function_exists where it makes sense
2015-09-04 15:05:40 +02:00
Andreas Fischer
5cfa3a584e
Merge branch '1.0' into 2.0
...
* 1.0:
Remove unnecessary parens
Convert most instances of function_exists() to extension_loaded() where applicable
Conflicts:
phpseclib/Crypt/Random.php
phpseclib/Math/BigInteger.php
2015-09-04 15:05:22 +02:00
Andreas Fischer
e08e2fd300
Merge pull request #791 from cweagans/switch-to-extension-loaded-1.0
...
Switch to extension loaded (1.0)
* cweagans/switch-to-extension-loaded-1.0:
Remove unnecessary parens
Convert most instances of function_exists() to extension_loaded() where applicable
2015-09-04 15:04:17 +02:00
Cameron Eagans
8206061a30
Remove unnecessary parens
2015-09-02 15:22:37 -04:00
Andreas Fischer
40927a4033
Merge pull request #802 from GrahamForks/2.0-phpdoc
...
[2.0] PHPDoc Fixes
* GrahamForks/2.0-phpdoc:
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
2015-09-02 20:47:45 +02:00
Andreas Fischer
1aa911d4a3
Merge branch '1.0' into 2.0
...
* 1.0:
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
Conflicts:
phpseclib/Crypt/AES.php
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RC2.php
phpseclib/Crypt/RC4.php
phpseclib/Crypt/RSA.php
phpseclib/Crypt/Random.php
phpseclib/Crypt/Rijndael.php
phpseclib/Crypt/TripleDES.php
phpseclib/Crypt/Twofish.php
phpseclib/File/ASN1.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SCP.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
phpseclib/System/SSH/Agent.php
2015-09-02 20:47:28 +02:00
Andreas Fischer
e1bd0dfaf5
Merge pull request #801 from GrahamForks/1.0-phpdoc
...
[1.0] PHPDoc Fixes
* GrahamForks/1.0-phpdoc:
Fixed lots of phpdoc typos
Fixed invalid param phpdoc
2015-09-02 20:43:38 +02:00
Andreas Fischer
9691924b31
Merge pull request #794 from cweagans/php7-random-bytes-2.0
...
Use random_bytes() when appropriate (2.0)
* cweagans/php7-random-bytes-2.0:
Remove duplicate allow_failures section
Test on PHP 7 & allow failures
Coding standards fix
Switch from EngineException to Error
Remove string assignment
Use random_bytes() when appropriate.
2015-09-02 20:38:02 +02:00
Andreas Fischer
79e90801bc
Merge pull request #805 from bantu/travis-php-7.0-2.0
...
Backport to 2.0: Add PHP7 to Travis CI.
* bantu/travis-php-7.0-2.0:
Backport to 2.0: Add PHP7 to Travis CI.
2015-09-02 20:37:56 +02:00
Andreas Fischer
1b93e0bf38
Backport to 2.0: Add PHP7 to Travis CI.
...
Cherry pick of 2813e2cd3b
2015-09-02 20:26:11 +02:00
