octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-08 14:51:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0'

Browse Source
This commit is contained in:
terrafrost 2023-09-25 07:04:36 -05:00
commit 839fd018d8
5 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpseclib/Math/BigInteger.php
View File

@ -32,6 +32,7 @@ namespace phpseclib3\Math;
use phpseclib3\Exception\BadConfigurationException; use phpseclib3\Exception\BadConfigurationException;
use phpseclib3\Exception\InvalidArgumentException; use phpseclib3\Exception\InvalidArgumentException;
use phpseclib3\Math\BigInteger\Engines\Engine; use phpseclib3\Math\BigInteger\Engines\Engine;
use UnexpectedValueException;
/** /**
* Pure-PHP arbitrary precision integer arithmetic library. Supports base-2, base-10, base-16, and base-256 * Pure-PHP arbitrary precision integer arithmetic library. Supports base-2, base-10, base-16, and base-256
@ -144,13 +145,16 @@ class BigInteger implements \JsonSerializable
['PHP64', ['DefaultEngine']], ['PHP64', ['DefaultEngine']],
['PHP32', ['DefaultEngine']], ['PHP32', ['DefaultEngine']],
]; ];
foreach ($engines as $engine) { foreach ($engines as $engine) {
try { try {
self::setEngine($engine[0], $engine[1]); self::setEngine($engine[0], $engine[1]);
break; return;
} catch (\Exception $e) { } catch (\Exception $e) {
} }
} }
throw new UnexpectedValueException('No valid BigInteger found. This is only possible when JIT is enabled on Windows and neither the GMP or BCMath extensions are available so either disable JIT or install GMP / BCMath');
} }
} }

14
phpseclib/Math/BigInteger/Engines/PHP.php
View File

@ -1236,4 +1236,18 @@ abstract class PHP extends Engine
return array_reverse($vals); return array_reverse($vals);
} }
/**
* @return bool
*/
protected static function testJITOnWindows()
{
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' && function_exists('opcache_get_status') && !defined('PHPSECLIB_ALLOW_JIT')) {
$status = opcache_get_status();
if ($status && isset($status['jit']) && $status['jit']['enabled'] && $status['jit']['on']) {
return true;
}
}
return false;
}
} }

2
phpseclib/Math/BigInteger/Engines/PHP32.php
View File

@ -103,7 +103,7 @@ class PHP32 extends PHP
*/ */
public static function isValidEngine(): bool public static function isValidEngine(): bool
{ {
return PHP_INT_SIZE >= 4; return PHP_INT_SIZE >= 4 && !self::testJITOnWindows();
} }
/** /**

2
phpseclib/Math/BigInteger/Engines/PHP64.php
View File

@ -104,7 +104,7 @@ class PHP64 extends PHP
*/ */
public static function isValidEngine(): bool public static function isValidEngine(): bool
{ {
return PHP_INT_SIZE >= 8; return PHP_INT_SIZE >= 8 && !self::testJITOnWindows();
} }
/** /**

11
phpseclib/bootstrap.php
View File

@ -10,12 +10,13 @@
* @license http://www.opensource.org/licenses/mit-license.html MIT License * @license http://www.opensource.org/licenses/mit-license.html MIT License
*/ */
// see https://github.com/php/php-src/issues/11917 if (extension_loaded('mbstring')) {
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' && function_exists('opcache_get_status') && !defined('PHPSECLIB_ALLOW_JIT')) { // 2 - MB_OVERLOAD_STRING
$status = opcache_get_status(); // mbstring.func_overload is deprecated in php 7.2 and removed in php 8.0.
if ($status && isset($status['jit']) && $status['jit']['enabled'] && $status['jit']['on']) { if (version_compare(PHP_VERSION, '8.0.0') < 0 && ini_get('mbstring.func_overload') & 2) {
throw new UnexpectedValueException( throw new UnexpectedValueException(
'JIT on Windows is not currently supported' 'Overloading of string functions using mbstring.func_overload ' .
'is not supported by phpseclib.'
); );
} }
} }