terrafrost
b4cf10fc94
Revert "Merge branch '2.0'"
...
This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing
changes made to 638fe6971c
.
2016-04-10 11:30:59 -05:00
terrafrost
4b69dcb1ca
Revert "Merge remote-tracking branch 'bantu/bootstrap'"
...
This reverts commit ef04c870e9
, reversing
changes made to cd57bf31ae
.
2016-04-10 11:25:31 -05:00
terrafrost
2ae82a1bc7
Merge branch '2.0'
2016-03-19 12:23:11 -05:00
terrafrost
6bfbfdbf7e
Merge branch '1.0' into 2.0
2016-03-19 12:23:04 -05:00
Abhishek Taneja
cb2ccea219
changing valid condition order, _slidingWindow biginteger
2016-03-19 12:11:59 -05:00
terrafrost
f8dc527af5
Merge branch 'master' into biginteger-revamp
2016-01-08 10:43:49 -06:00
terrafrost
1e15ef5a55
Merge branch 'bitwise-not-1.0' into 2.0
2016-01-08 10:42:20 -06:00
terrafrost
7ad9eade2d
BigInteger: fix issue with doing bitwise not on 0
2016-01-08 10:31:48 -06:00
terrafrost
f7efbcbc8e
BigInteger: updates per Joey3000
2016-01-08 10:19:48 -06:00
terrafrost
d86c61de78
BigInteger: add getprecision
2016-01-03 10:42:44 -06:00
terrafrost
a0d21b6321
BigInteger: make select methods static, add type hinting, etc
2015-12-27 10:24:17 -06:00
terrafrost
eac8613c75
BigInteger: 2.0 specific updates for __debuginfo
2015-12-14 13:56:07 -06:00
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
Andreas Fischer
fc417115be
Merge branch 'master' into php5
...
* master:
BigInteger: one more change to the comments
BigInteger: update comments
BigInteger: unit test update
BigInteger: change argument names for random / randomPrime
BigInteger: fix unit tests
BigInteger: fix syntax error
BigInteger: make it so you can do $min->random($max)
Conflicts:
phpseclib/Math/BigInteger.php
2014-06-16 17:00:00 +02:00
terrafrost
4b9eb4af27
BigInteger: one more change to the comments
2014-06-16 09:23:34 -05:00
terrafrost
0eb0ae7ff7
BigInteger: update comments
2014-06-16 09:09:26 -05:00
terrafrost
34a971d317
BigInteger: change argument names for random / randomPrime
2014-06-14 23:49:57 -05:00
terrafrost
f8f0bd44b7
BigInteger: fix syntax error
2014-06-14 19:20:05 -05:00
terrafrost
46166c7351
BigInteger: make it so you can do $min->random($max)
...
...and $min->randomPrime($max) as well
2014-06-14 14:07:33 -05:00
Andreas Fischer
65ec4dc8bc
Some more documentation polishing in Math/BigInteger.php.
2014-06-02 20:19:00 +02:00
Andreas Fischer
a011596578
Replace new Math_BigInteger with new static.
2014-06-02 20:19:00 +02:00
Andreas Fischer
740422c65f
Reference to instances as BigInteger instead of Math_BigInteger.
2014-06-02 20:19:00 +02:00
Andreas Fischer
00f77ab341
Use namespace in example code.
2014-06-02 20:19:00 +02:00
Andreas Fischer
ae4099dc64
Remove any include statement.
2014-06-02 20:19:00 +02:00
Andreas Fischer
8dff257cae
Add namespace statement. Rename class.
2014-06-02 20:17:18 +02:00
Andreas Fischer
7d9598a21e
Use __construct.
2014-06-02 20:17:18 +02:00
Andreas Fischer
6f4a873cad
Merge branch 'master' into php5
...
* master:
Adjust documentation to coding guidelines: No () around include.
2014-06-02 12:51:24 +02:00
Andreas Fischer
e6f87318f5
Adjust documentation to coding guidelines: No () around include.
2014-06-01 23:28:49 +02:00
Andreas Fischer
4a89349615
Merge branch 'master' into php5
...
* master:
BigInteger: "be less overly clever loading Crypt/Random"
2014-05-30 15:50:36 +02:00
terrafrost
7c08ab71d3
BigInteger: "be less overly clever loading Crypt/Random"
...
pretty much the same as this commit:
28f18f83ec
2014-05-29 16:31:26 -05:00
Andreas Fischer
b7ebb1e0e3
Merge branch 'master' into php5
...
* master:
BigInteger: speedup internal mode slightly
2014-05-06 00:49:46 +02:00
terrafrost
309c8fd555
BigInteger: speedup internal mode slightly
...
Changes should yield a slight speedup per the analysis at https://github.com/phpseclib/phpseclib/pull/317#issuecomment-42122335
2014-05-05 11:34:45 -05:00
Andreas Fischer
1d01f56f28
Merge branch 'master' into php5
...
* master:
BigInteger: update comments and add test case
BigInteger: fix some int64 issues
2014-04-29 16:32:59 +02:00
terrafrost
9eb6e1ed67
BigInteger: update comments and add test case
2014-04-29 16:32:25 +02:00
terrafrost
e4ff01f054
BigInteger: fix some int64 issues
2014-04-29 16:32:25 +02:00
Andreas Fischer
5cfe1560a0
Merge branch 'master' into php5
...
* master:
BigInteger: explain precense of uncallable code
2014-04-19 14:05:12 +02:00
terrafrost
0cbb631852
BigInteger: explain precense of uncallable code
2014-04-18 23:43:03 -05:00
Andreas Fischer
7348ab6ef7
Remove deprecated method Math_BigInteger::setRandomGenerator().
2014-04-13 01:04:37 +02:00
terrafrost
a8c2ff0fb0
add error suppression to phpinfo()
...
bad timezone settings can make phpinfo() throw errors so we'll just
suppress them. if there are legit non-timezone errors with php install
those will probably be hit in other parts of the code
2014-03-30 10:15:08 -05:00
Andreas Fischer
fb1296bbec
Drop meaningless, outdated, inconsistent version tags in doc blocks.
...
find phpseclib -type f -name "*.php" -exec sed -i '/@version/d' {} \;
2014-03-11 15:58:33 +01:00
Veres Lajos
930a3fb4d2
typofixes - https://github.com/vlajos/misspell_fixer
2014-03-05 23:41:20 +00:00
Andreas Fischer
c1597f4533
Remove HTML from BigInteger code example.
2014-03-01 01:40:28 +01:00
Andreas Fischer
8bb80b3df0
CS: Add useful whitespace CodeSniffer rules.
2013-12-26 00:33:08 +01:00
Andreas Fischer
f0f029b2c1
CS: Fix "PEAR.Commenting.ClassComment.WrongTagOrder" sniff.
2013-12-11 18:33:18 +01:00
Andreas Fischer
3db1fbb072
CS: Fix "PEAR.Commenting.FileComment.TagIndent" sniff.
2013-12-10 20:10:37 +01:00
Andreas Fischer
ef2c50f9e0
Ignore coding style for "HAC 4.49" block in Math/BigInteger.php.
2013-12-03 21:04:13 +01:00
Andreas Fischer
e09f1b730e
CodeSniffer: Fix PEAR.Classes.ClassDeclaration.OpenBraceNewLine sniff.
2013-12-03 19:34:41 +01:00
Marc Philip Scholten
3bfd884813
Removed vim comments
...
Reformated files
2013-11-23 19:42:26 +01:00
terrafrost
77447a3fc7
BigInteger, RSA: updates to OpenSSL version detection code
2013-09-20 12:14:01 -05:00
terrafrost
54f0f2131b
RSA, BigInteger: add more openssl checks
2013-09-10 11:07:56 -05:00
terrafrost
442922ff0a
BigInteger: refactor random number generation code somewhat
2013-08-06 23:17:49 -05:00