terrafrost
8448f63d76
Merge branch '1.0' into 2.0
2015-12-14 11:01:51 -06:00
terrafrost
c655b16f75
BigInteger: add engine to __debugInfo output and add unit test
2015-12-07 15:22:53 -06:00
terrafrost
37535744b2
small tweaks
2015-11-21 22:55:20 -05:00
terrafrost
33ea01f1ac
Merge branch 'phpdoc-1.0' into phpdoc-2.0
...
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/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-10-12 14:10:26 -05:00
terrafrost
2048a49aac
use self:: in phpdoc comments to reduce merge conflicts
2015-10-11 12:22:07 -05:00
terrafrost
19229ed224
phpDoc changes
2015-10-05 13:22:51 -05:00
Graham Campbell
7f1bbfe216
Fixed phpdoc
2015-09-14 16:30:31 +01: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
terrafrost
8b8d7a5dcd
small CS changes
2015-09-13 18:13:35 -05:00
Graham Campbell
b1db7f05d9
Minor tweaks
2015-09-06 23:01:03 +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
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
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
Graham Campbell
634c1c2a18
Fixed lots of phpdoc typos
2015-09-02 00:42:15 +01:00
Graham Campbell
c08c099c56
Fixed invalid param phpdoc
2015-09-02 00:41:38 +01:00
Graham Campbell
cd0e10cf9d
Fixed lots of phpdoc typos
2015-09-02 00:37:54 +01:00
Graham Campbell
5890f3da98
Fixed invalid param phpdoc
2015-09-02 00:22:30 +01:00
Cameron Eagans
2b75c37cc9
Convert most instances of function_exists() to extension_loaded() where applicable
2015-09-01 14:32:22 -04:00
Cameron Eagans
df6b201ab9
Switch to extension_loaded('gmp')
2015-09-01 14:22:17 -04:00
Cameron Eagans
a84699a346
Switch to extension_loaded instead of function_exists where it makes sense
2015-09-01 14:22:12 -04:00
Andreas Fischer
d9e9504fba
Merge branch 'PSR2-1.0' into PSR2-2.0
...
* PSR2-1.0:
Fix indentation phpcbf did not fix.
Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
Use phpcbf to fix PHP code to ruleset.
Ignore coding guidelines in ANSI switch block.
Base code sniffer ruleset on PSR2 rather than PEAR.
Update PHP Code Sniffer to 2.3.3
Conflicts:
build/code-sniffer-ruleset-tests.xml
build/code-sniffer-ruleset.xml
composer.lock
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RSA.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
tests/Unit/Crypt/TwofishTest.php
2015-07-17 13:41:59 +02:00
Andreas Fischer
2013a31ecd
Use phpcbf to fix PHP code to ruleset.
2015-07-17 12:57:41 +02:00
terrafrost
d75f703c0a
rm PHP v4 compatability claim
2015-04-02 05:57:52 -05:00
Andreas Fischer
04dad3ff8c
Merge branch 'master' into php5
...
* master:
Compare numeric part of OpenSSL version
2015-01-09 13:09:21 +01:00
Ha Phan
b0129e9125
Compare numeric part of OpenSSL version
2015-01-08 20:55:14 +07:00
Clint Nelissen
f3565346fa
Replaced get_class() calls with instanceof operators
2014-12-24 13:07:14 -08:00
Clint Nelissen
fe742e18d7
Namespaced Crypt Package
2014-12-16 16:16:54 -08:00
Andreas Fischer
c4b103468c
Merge pull request #549 from bantu/fix-547
...
Change copyright years from roman numeral to decimal numbers.
* bantu/fix-547:
Change copyright years from roman numeral to decimal numbers.
Conflicts:
phpseclib/System/SSH_Agent.php
2014-12-10 00:06:08 +01:00
Andreas Fischer
0efae5a91e
Change copyright years from roman numeral to decimal numbers.
2014-12-10 00:04:08 +01:00
Andreas Fischer
2f27620409
Add #@+ block for properties used by internal implementation.
2014-12-08 16:02:39 +01:00
Andreas Fischer
8ecf956499
Move in-code comments to property doc blocks.
2014-12-07 23:00:59 +01:00
Clint Nelissen
f5d6b7423d
Refactor defined MATH_BIGINTEGER_ constants into class constants.
2014-12-07 22:33:39 +01:00
Andreas Fischer
638e62d60a
Remove LICENSE text from source code files.
2014-12-03 18:49:33 +01:00
Clint Nelissen
f5ed86e385
Renamed Random::crypt_random_string to Random::string
2014-12-02 09:20:40 -08:00
Clint Nelissen
c70702afbb
Namespaced Crypt\Random
2014-12-02 08:41:30 -08:00
Clint Nelissen
9c0c3faeb7
Initial commit
2014-12-01 18:54:44 -08: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
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
da02246cc4
Merge branch 'master' into php5
...
* master:
BigInteger: accomodate GMP change in PHP 5.6
2014-09-27 22:57:59 +02:00
terrafrost
a43dd38365
BigInteger: accomodate GMP change in PHP 5.6
2014-09-27 12:52:54 -05:00
Andreas Fischer
c59750562a
Merge branch 'master' into php5
...
* master:
BigInteger: fix previous fix
BigInteger: small optimization to bitwise_not
2014-08-12 11:30:30 +02:00
terrafrost
33182bb2de
BigInteger: fix previous fix
2014-08-10 14:47:08 -05:00
terrafrost
4ce7a0f63a
BigInteger: small optimization to bitwise_not
2014-08-10 02:03:58 -05:00
Andreas Fischer
e4516fb453
Merge branch 'master' into php5
...
* master:
Add some test cases for SHA512.
Use toBits() as there is no bits property.
SSH2: Disallow the none MAC.
2014-07-26 17:20:09 +02:00
Andreas Fischer
737c8a9d0f
Use toBits() as there is no bits property.
2014-07-26 13:43:57 +02:00