octoleo
/
phpseclib
mirror of https://github.com/phpseclib/phpseclib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor

This commit is contained in:
Daniil Gentili 2023-09-22 10:07:03 +02:00
parent e113bb35e7
commit 7b9ab171ce
No known key found for this signature in database
GPG Key ID: 8C1BE3B34B230CA7
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
phpseclib/Math/BigInteger.php
View File

@ -136,16 +136,6 @@ class BigInteger implements \JsonSerializable
private static function initialize_static_variables()
{
if (!isset(self::$mainEngine)) {
// see https://github.com/php/php-src/issues/11917
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']) {
throw new UnexpectedValueException(
'JIT on Windows is not currently supported'
);
}
}
$engines = [
['GMP', ['DefaultEngine']],
['PHP64', ['OpenSSL']],
@ -154,13 +144,16 @@ class BigInteger implements \JsonSerializable
['PHP64', ['DefaultEngine']],
['PHP32', ['DefaultEngine']]
];
foreach ($engines as $engine) {
try {
self::setEngine($engine[0], $engine[1]);
break;
return;
} 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

@ -1326,4 +1326,18 @@ abstract class PHP extends Engine
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

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

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

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