mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-12-28 04:05:15 +00:00
Merge branch '1.0' into 2.0
This commit is contained in:
commit
a7a39624b0
@ -2803,6 +2803,25 @@ abstract class Base
|
|||||||
// PHP 5.3, per http://php.net/releases/5_3_0.php, introduced "more consistent float rounding"
|
// PHP 5.3, per http://php.net/releases/5_3_0.php, introduced "more consistent float rounding"
|
||||||
case (php_uname('m') & "\xDF\xDF\xDF") != 'ARM':
|
case (php_uname('m') & "\xDF\xDF\xDF") != 'ARM':
|
||||||
return $x;
|
return $x;
|
||||||
|
case (php_uname('m') & "\xDF\xDF\xDF") == 'ARM':
|
||||||
|
switch (true) {
|
||||||
|
// PHP_VERSION_ID wasn't a constant until PHP 5.2.7
|
||||||
|
case version_compare(PHP_VERSION, '5.3.0') < 1:
|
||||||
|
/* PHP 7.0.0 introduced a bug that affected 32-bit ARM processors:
|
||||||
|
|
||||||
|
https://github.com/php/php-src/commit/716da71446ebbd40fa6cf2cea8a4b70f504cc3cd
|
||||||
|
|
||||||
|
altho the changelogs make no mention of it, this bug was fixed with this commit:
|
||||||
|
|
||||||
|
https://github.com/php/php-src/commit/c1729272b17a1fe893d1a54e423d3b71470f3ee8
|
||||||
|
|
||||||
|
affected versions of PHP are: 7.0.x, 7.1.0 - 7.1.23 and 7.2.0 - 7.2.11 */
|
||||||
|
case PHP_VERSION_ID >= 70000 && PHP_VERSION_ID <= 70123:
|
||||||
|
case PHP_VERSION_ID >= 70200 && PHP_VERSION_ID <= 70211:
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return $x;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return (fmod($x, 0x80000000) & 0x7FFFFFFF) |
|
return (fmod($x, 0x80000000) & 0x7FFFFFFF) |
|
||||||
((fmod(floor($x / 0x80000000), 2) & 1) << 31);
|
((fmod(floor($x / 0x80000000), 2) & 1) << 31);
|
||||||
@ -2821,6 +2840,15 @@ abstract class Base
|
|||||||
case (php_uname('m') & "\xDF\xDF\xDF") != 'ARM':
|
case (php_uname('m') & "\xDF\xDF\xDF") != 'ARM':
|
||||||
return '%s';
|
return '%s';
|
||||||
break;
|
break;
|
||||||
|
case (php_uname('m') & "\xDF\xDF\xDF") == 'ARM':
|
||||||
|
switch (true) {
|
||||||
|
case version_compare(PHP_VERSION, '5.3.0') < 1:
|
||||||
|
case PHP_VERSION_ID >= 70000 && PHP_VERSION_ID <= 70123:
|
||||||
|
case PHP_VERSION_ID >= 70200 && PHP_VERSION_ID <= 70211:
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return '%s';
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
$safeint = '(is_int($temp = %s) ? $temp : (fmod($temp, 0x80000000) & 0x7FFFFFFF) | ';
|
$safeint = '(is_int($temp = %s) ? $temp : (fmod($temp, 0x80000000) & 0x7FFFFFFF) | ';
|
||||||
return $safeint . '((fmod(floor($temp / 0x80000000), 2) & 1) << 31))';
|
return $safeint . '((fmod(floor($temp / 0x80000000), 2) & 1) << 31))';
|
||||||
|
Loading…
Reference in New Issue
Block a user