Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2017-10-05 05:37:56 -05:00
commit 245e7a15ca
2 changed files with 2 additions and 2 deletions

View File

@ -2423,7 +2423,7 @@ class RSA
$db = $maskedDB ^ $dbMask; $db = $maskedDB ^ $dbMask;
$lHash2 = substr($db, 0, $this->hLen); $lHash2 = substr($db, 0, $this->hLen);
$m = substr($db, $this->hLen); $m = substr($db, $this->hLen);
if ($lHash != $lHash2) { if (!$this->_equals($lHash, $lHash2)) {
user_error('Decryption error'); user_error('Decryption error');
return false; return false;
} }

View File

@ -2908,7 +2908,7 @@ class BigInteger
// (will always result in a smaller number. ie. ~1 isn't 1111 1110 - it's 0) // (will always result in a smaller number. ie. ~1 isn't 1111 1110 - it's 0)
$temp = $this->toBytes(); $temp = $this->toBytes();
if ($temp == '') { if ($temp == '') {
return ''; return $this->_normalize(new Math_BigInteger());
} }
$pre_msb = decbin(ord($temp[0])); $pre_msb = decbin(ord($temp[0]));
$temp = ~$temp; $temp = ~$temp;