Merge branch 'php7' into 2.0

Conflicts:
	phpseclib/Math/BigInteger.php
This commit is contained in:
terrafrost 2015-09-13 19:15:13 -05:00
commit 3f7b3b393e

View File

@ -3519,7 +3519,7 @@ class BigInteger
switch (MATH_BIGINTEGER_MODE) { switch (MATH_BIGINTEGER_MODE) {
case self::MODE_GMP: case self::MODE_GMP:
if (!empty($result->bitmask->value)) { if ($this->bitmask !== false) {
$result->value = gmp_and($result->value, $result->bitmask->value); $result->value = gmp_and($result->value, $result->bitmask->value);
} }