Skip to content

Commit 930ba10

Browse files
lbr38lbr38
committed
patch
1 parent 6541524 commit 930ba10

31 files changed

Lines changed: 1109 additions & 388 deletions

‎www/libs/composer.lock‎

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎www/libs/vendor/composer/installed.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -408,17 +408,17 @@
408408
},
409409
{
410410
"name": "phpseclib/phpseclib",
411-
"version": "3.0.50",
412-
"version_normalized": "3.0.50.0",
411+
"version": "3.0.51",
412+
"version_normalized": "3.0.51.0",
413413
"source": {
414414
"type": "git",
415415
"url": "https://github.com/phpseclib/phpseclib.git",
416-
"reference": "aa6ad8321ed103dc3624fb600a25b66ebf78ec7b"
416+
"reference": "d59c94077f9c9915abb51ddb52ce85188ece1748"
417417
},
418418
"dist": {
419419
"type": "zip",
420-
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/aa6ad8321ed103dc3624fb600a25b66ebf78ec7b",
421-
"reference": "aa6ad8321ed103dc3624fb600a25b66ebf78ec7b",
420+
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d59c94077f9c9915abb51ddb52ce85188ece1748",
421+
"reference": "d59c94077f9c9915abb51ddb52ce85188ece1748",
422422
"shasum": ""
423423
},
424424
"require": {
@@ -436,7 +436,7 @@
436436
"ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
437437
"ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
438438
},
439-
"time": "2026-03-19T02:57:58+00:00",
439+
"time": "2026-04-10T01:33:53+00:00",
440440
"type": "library",
441441
"installation-source": "dist",
442442
"autoload": {
@@ -501,7 +501,7 @@
501501
],
502502
"support": {
503503
"issues": "https://github.com/phpseclib/phpseclib/issues",
504-
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.50"
504+
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.51"
505505
},
506506
"funding": [
507507
{
@@ -1365,17 +1365,17 @@
13651365
},
13661366
{
13671367
"name": "symfony/polyfill-mbstring",
1368-
"version": "v1.33.0",
1369-
"version_normalized": "1.33.0.0",
1368+
"version": "v1.34.0",
1369+
"version_normalized": "1.34.0.0",
13701370
"source": {
13711371
"type": "git",
13721372
"url": "https://github.com/symfony/polyfill-mbstring.git",
1373-
"reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
1373+
"reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315"
13741374
},
13751375
"dist": {
13761376
"type": "zip",
1377-
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
1378-
"reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
1377+
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6a21eb99c6973357967f6ce3708cd55a6bec6315",
1378+
"reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315",
13791379
"shasum": ""
13801380
},
13811381
"require": {
@@ -1388,7 +1388,7 @@
13881388
"suggest": {
13891389
"ext-mbstring": "For best performance"
13901390
},
1391-
"time": "2024-12-23T08:48:59+00:00",
1391+
"time": "2026-04-10T17:25:58+00:00",
13921392
"type": "library",
13931393
"extra": {
13941394
"thanks": {
@@ -1429,7 +1429,7 @@
14291429
"shim"
14301430
],
14311431
"support": {
1432-
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
1432+
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.34.0"
14331433
},
14341434
"funding": [
14351435
{
@@ -1453,23 +1453,23 @@
14531453
},
14541454
{
14551455
"name": "symfony/polyfill-php83",
1456-
"version": "v1.33.0",
1457-
"version_normalized": "1.33.0.0",
1456+
"version": "v1.34.0",
1457+
"version_normalized": "1.34.0.0",
14581458
"source": {
14591459
"type": "git",
14601460
"url": "https://github.com/symfony/polyfill-php83.git",
1461-
"reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5"
1461+
"reference": "3600c2cb22399e25bb226e4a135ce91eeb2a6149"
14621462
},
14631463
"dist": {
14641464
"type": "zip",
1465-
"url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/17f6f9a6b1735c0f163024d959f700cfbc5155e5",
1466-
"reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5",
1465+
"url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/3600c2cb22399e25bb226e4a135ce91eeb2a6149",
1466+
"reference": "3600c2cb22399e25bb226e4a135ce91eeb2a6149",
14671467
"shasum": ""
14681468
},
14691469
"require": {
14701470
"php": ">=7.2"
14711471
},
1472-
"time": "2025-07-08T02:45:35+00:00",
1472+
"time": "2026-04-10T17:25:58+00:00",
14731473
"type": "library",
14741474
"extra": {
14751475
"thanks": {
@@ -1512,7 +1512,7 @@
15121512
"shim"
15131513
],
15141514
"support": {
1515-
"source": "https://github.com/symfony/polyfill-php83/tree/v1.33.0"
1515+
"source": "https://github.com/symfony/polyfill-php83/tree/v1.34.0"
15161516
},
15171517
"funding": [
15181518
{

‎www/libs/vendor/composer/installed.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => '__root__',
44
'pretty_version' => 'dev-main',
55
'version' => 'dev-main',
6-
'reference' => '92a479dd0e548c3ca6782254ba3f162465ad2bce',
6+
'reference' => '6541524849a77059aa4ebe50c071aba114ec4c96',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -13,7 +13,7 @@
1313
'__root__' => array(
1414
'pretty_version' => 'dev-main',
1515
'version' => 'dev-main',
16-
'reference' => '92a479dd0e548c3ca6782254ba3f162465ad2bce',
16+
'reference' => '6541524849a77059aa4ebe50c071aba114ec4c96',
1717
'type' => 'library',
1818
'install_path' => __DIR__ . '/../../',
1919
'aliases' => array(),
@@ -74,9 +74,9 @@
7474
'dev_requirement' => false,
7575
),
7676
'phpseclib/phpseclib' => array(
77-
'pretty_version' => '3.0.50',
78-
'version' => '3.0.50.0',
79-
'reference' => 'aa6ad8321ed103dc3624fb600a25b66ebf78ec7b',
77+
'pretty_version' => '3.0.51',
78+
'version' => '3.0.51.0',
79+
'reference' => 'd59c94077f9c9915abb51ddb52ce85188ece1748',
8080
'type' => 'library',
8181
'install_path' => __DIR__ . '/../phpseclib/phpseclib',
8282
'aliases' => array(),
@@ -203,18 +203,18 @@
203203
'dev_requirement' => false,
204204
),
205205
'symfony/polyfill-mbstring' => array(
206-
'pretty_version' => 'v1.33.0',
207-
'version' => '1.33.0.0',
208-
'reference' => '6d857f4d76bd4b343eac26d6b539585d2bc56493',
206+
'pretty_version' => 'v1.34.0',
207+
'version' => '1.34.0.0',
208+
'reference' => '6a21eb99c6973357967f6ce3708cd55a6bec6315',
209209
'type' => 'library',
210210
'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
211211
'aliases' => array(),
212212
'dev_requirement' => false,
213213
),
214214
'symfony/polyfill-php83' => array(
215-
'pretty_version' => 'v1.33.0',
216-
'version' => '1.33.0.0',
217-
'reference' => '17f6f9a6b1735c0f163024d959f700cfbc5155e5',
215+
'pretty_version' => 'v1.34.0',
216+
'version' => '1.34.0.0',
217+
'reference' => '3600c2cb22399e25bb226e4a135ce91eeb2a6149',
218218
'type' => 'library',
219219
'install_path' => __DIR__ . '/../symfony/polyfill-php83',
220220
'aliases' => array(),

‎www/libs/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/AsymmetricKey.php‎

Lines changed: 40 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,19 @@ abstract class AsymmetricKey
7979
private static $invisiblePlugins = [];
8080

8181
/**
82-
* Available Engines
82+
* Key Comment
8383
*
84-
* @var boolean[]
84+
* @var null|string
8585
*/
86-
protected static $engines = [];
86+
private $comment;
8787

8888
/**
89-
* Key Comment
89+
* OpenSSL configuration file name.
9090
*
91-
* @var null|string
91+
* @see self::createKey()
92+
* @var ?string
9293
*/
93-
private $comment;
94+
protected static $configFile;
9495

9596
/**
9697
* @param string $type
@@ -119,6 +120,10 @@ protected static function initialize_static_variables()
119120
self::$one = new BigInteger(1);
120121
}
121122

123+
if (!isset(self::$configFile)) {
124+
self::$configFile = dirname(__FILE__) . '/../../openssl.cnf';
125+
}
126+
122127
self::loadPlugins('Keys');
123128
if (static::ALGORITHM != 'RSA' && static::ALGORITHM != 'DH') {
124129
self::loadPlugins('Signature');
@@ -363,6 +368,18 @@ public static function getSupportedKeyFormats()
363368
return self::$plugins[static::ALGORITHM]['Keys'];
364369
}
365370

371+
/**
372+
* Sets the OpenSSL config file path
373+
*
374+
* Set to the empty string to use the default config file
375+
*
376+
* @param string $val
377+
*/
378+
public static function setOpenSSLConfigPath($val)
379+
{
380+
self::$configFile = $val;
381+
}
382+
366383
/**
367384
* Add a fileformat plugin
368385
*
@@ -419,34 +436,28 @@ public function getComment()
419436
}
420437

421438
/**
422-
* Tests engine validity
423-
*
439+
* Force engine (useful for unit testing)
424440
*/
425-
public static function useBestEngine()
441+
public static function forceEngine($engine = null)
426442
{
427-
static::$engines = [
428-
'PHP' => true,
429-
'OpenSSL' => extension_loaded('openssl'),
430-
// this test can be satisfied by either of the following:
431-
// http://php.net/manual/en/book.sodium.php
432-
// https://github.com/paragonie/sodium_compat
433-
'libsodium' => function_exists('sodium_crypto_sign_keypair')
434-
];
435-
436-
return static::$engines;
443+
if (!isset($engine)) {
444+
static::$forcedEngine = null;
445+
return;
446+
}
447+
switch ($engine) {
448+
case 'PHP':
449+
case 'OpenSSL':
450+
case 'libsodium':
451+
static::$forcedEngine = $engine;
452+
break;
453+
default:
454+
throw new \InvalidArgumentException('Valid engines are null, PHP, OpenSSL or libsodium');
455+
}
437456
}
438457

439-
/**
440-
* Flag to use internal engine only (useful for unit testing)
441-
*
442-
*/
443-
public static function useInternalEngine()
458+
public static function getForcedEngine()
444459
{
445-
static::$engines = [
446-
'PHP' => true,
447-
'OpenSSL' => false,
448-
'libsodium' => false
449-
];
460+
return static::$forcedEngine;
450461
}
451462

452463
/**

0 commit comments

Comments
 (0)