1
0
mirror of https://github.com/danog/MadelineProto.git synced 2024-11-27 08:34:41 +01:00

Applied fixes from StyleCI

This commit is contained in:
Daniil Gentili 2016-08-10 08:51:37 -04:00 committed by StyleCI Bot
parent e7487ab60c
commit bf218ae218

View File

@ -140,7 +140,7 @@ class PrimeModule
} }
$max = new \phpseclib\Math\BigInteger($n - 1); $max = new \phpseclib\Math\BigInteger($n - 1);
$big = new \phpseclib\Math\BigInteger(); $big = new \phpseclib\Math\BigInteger();
list($y, $c, $m) = [(int)$big->random($zero, $max)->toString(), (int)$big->random($zero, $max)->toString(), (int)$big->random($zero, $max)->toString()]; list($y, $c, $m) = [(int) $big->random($zero, $max)->toString(), (int) $big->random($zero, $max)->toString(), (int) $big->random($zero, $max)->toString()];
list($g, $r, $q) = [1, 1, 1]; list($g, $r, $q) = [1, 1, 1];
do { do {
$x = $y; $x = $y;
@ -155,7 +155,7 @@ class PrimeModule
do { do {
$y = Tools::posmod(Tools::posmod(pow($y, 2), $n) + $c, $n); $y = Tools::posmod(Tools::posmod(pow($y, 2), $n) + $c, $n);
$q = Tools::posmod($q * abs($x - $y), $n); $q = Tools::posmod($q * abs($x - $y), $n);
} while(min($m, $r - $k)); } while (min($m, $r - $k));
$g = $this->gcd($q, $n); $g = $this->gcd($q, $n);
$k += $m; $k += $m;
} while ($k < $r and $g == 1); } while ($k < $r and $g == 1);
@ -166,7 +166,9 @@ class PrimeModule
while (true) { while (true) {
$ys = Tools::posmod(Tools::posmod(pow($ys, 2), $n) + $c, $n); $ys = Tools::posmod(Tools::posmod(pow($ys, 2), $n) + $c, $n);
$g = $this->gcd(abs($x - $ys), $n); $g = $this->gcd(abs($x - $ys), $n);
if ($g > 1) break; if ($g > 1) {
break;
}
} }
} }
@ -178,7 +180,7 @@ class PrimeModule
if (function_exists('shell_exec')) { if (function_exists('shell_exec')) {
try { try {
// Use the python version. // Use the python version.
$res = json_decode(shell_exec('python '.__DIR__.'/getpq.py '.(string)$pq)); $res = json_decode(shell_exec('python '.__DIR__.'/getpq.py '.(string) $pq));
if (count($res) == 2) { if (count($res) == 2) {
return $res; return $res;
} }
@ -213,9 +215,11 @@ class PrimeModule
if (count($res) == 2) { if (count($res) == 2) {
return $res; return $res;
} }
if(is_object($pq)) { if (is_object($pq)) {
$n = $pq->toString(); $n = $pq->toString();
} else $n = $pq; } else {
$n = $pq;
}
$n = (int) $n; $n = (int) $n;
$factors = []; $factors = [];
$limit = sqrt($n) + 1; $limit = sqrt($n) + 1;