Skip to content

Commit cf5bfdd

Browse files
nextcloud-commandnextcloud-command
committed
chore(autoloader): Dump autoloader
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
1 parent 2292aea commit cf5bfdd

File tree

17 files changed

+306
-120
lines changed

17 files changed

+306
-120
lines changed

‎composer/installed.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3090,17 +3090,17 @@
30903090
},
30913091
{
30923092
"name": "phpseclib/phpseclib",
3093-
"version": "2.0.40",
3094-
"version_normalized": "2.0.40.0",
3093+
"version": "2.0.47",
3094+
"version_normalized": "2.0.47.0",
30953095
"source": {
30963096
"type": "git",
30973097
"url": "https://github.com/phpseclib/phpseclib.git",
3098-
"reference": "5ef6f8376ddad21f3ce1da429950f7e00ec2292c"
3098+
"reference": "b7d7d90ee7df7f33a664b4aea32d50a305d35adb"
30993099
},
31003100
"dist": {
31013101
"type": "zip",
3102-
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/5ef6f8376ddad21f3ce1da429950f7e00ec2292c",
3103-
"reference": "5ef6f8376ddad21f3ce1da429950f7e00ec2292c",
3102+
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/b7d7d90ee7df7f33a664b4aea32d50a305d35adb",
3103+
"reference": "b7d7d90ee7df7f33a664b4aea32d50a305d35adb",
31043104
"shasum": ""
31053105
},
31063106
"require": {
@@ -3118,7 +3118,7 @@
31183118
"ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.",
31193119
"ext-xml": "Install the XML extension to load XML formatted public keys."
31203120
},
3121-
"time": "2022-12-17T17:22:59+00:00",
3121+
"time": "2024-02-26T04:55:38+00:00",
31223122
"type": "library",
31233123
"installation-source": "dist",
31243124
"autoload": {
@@ -3183,7 +3183,7 @@
31833183
],
31843184
"support": {
31853185
"issues": "https://github.com/phpseclib/phpseclib/issues",
3186-
"source": "https://github.com/phpseclib/phpseclib/tree/2.0.40"
3186+
"source": "https://github.com/phpseclib/phpseclib/tree/2.0.47"
31873187
},
31883188
"funding": [
31893189
{

‎composer/installed.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => 'nextcloud/3rdparty',
44
'pretty_version' => 'dev-master',
55
'version' => 'dev-master',
6-
'reference' => 'a7f0f5d93a0d9a947b4d3676d6344824d8490eab',
6+
'reference' => '2292aeac89a39167ee4916f3930aa47961b9a88d',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../',
99
'aliases' => array(),
@@ -328,7 +328,7 @@
328328
'nextcloud/3rdparty' => array(
329329
'pretty_version' => 'dev-master',
330330
'version' => 'dev-master',
331-
'reference' => 'a7f0f5d93a0d9a947b4d3676d6344824d8490eab',
331+
'reference' => '2292aeac89a39167ee4916f3930aa47961b9a88d',
332332
'type' => 'library',
333333
'install_path' => __DIR__ . '/../',
334334
'aliases' => array(),
@@ -437,9 +437,9 @@
437437
'dev_requirement' => false,
438438
),
439439
'phpseclib/phpseclib' => array(
440-
'pretty_version' => '2.0.40',
441-
'version' => '2.0.40.0',
442-
'reference' => '5ef6f8376ddad21f3ce1da429950f7e00ec2292c',
440+
'pretty_version' => '2.0.47',
441+
'version' => '2.0.47.0',
442+
'reference' => 'b7d7d90ee7df7f33a664b4aea32d50a305d35adb',
443443
'type' => 'library',
444444
'install_path' => __DIR__ . '/../phpseclib/phpseclib',
445445
'aliases' => array(),

‎phpseclib/phpseclib/phpseclib/Crypt/AES.php‎

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -84,43 +84,13 @@ function setBlockLength($length)
8484
*/
8585
function setKeyLength($length)
8686
{
87-
switch ($length) {
88-
case 160:
89-
$length = 192;
90-
break;
91-
case 224:
92-
$length = 256;
93-
}
9487
parent::setKeyLength($length);
95-
}
96-
97-
/**
98-
* Sets the key.
99-
*
100-
* Rijndael supports five different key lengths, AES only supports three.
101-
*
102-
* @see \phpseclib\Crypt\Rijndael:setKey()
103-
* @see setKeyLength()
104-
* @access public
105-
* @param string $key
106-
*/
107-
function setKey($key)
108-
{
109-
parent::setKey($key);
110-
111-
if (!$this->explicit_key_length) {
112-
$length = strlen($key);
113-
switch (true) {
114-
case $length <= 16:
115-
$this->key_length = 16;
116-
break;
117-
case $length <= 24:
118-
$this->key_length = 24;
119-
break;
120-
default:
121-
$this->key_length = 32;
122-
}
123-
$this->_setEngine();
88+
switch ($this->key_length) {
89+
case 20:
90+
$this->key_length = 24;
91+
break;
92+
case 28:
93+
$this->key_length = 32;
12494
}
12595
}
12696
}

‎phpseclib/phpseclib/phpseclib/Crypt/Base.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,8 @@ function __construct($mode = self::MODE_CBC)
514514
switch (true) {
515515
// PHP_OS & "\xDF\xDF\xDF" == strtoupper(substr(PHP_OS, 0, 3)), but a lot faster
516516
case (PHP_OS & "\xDF\xDF\xDF") === 'WIN':
517+
case !function_exists('php_uname'):
518+
case !is_string(php_uname('m')):
517519
case (php_uname('m') & "\xDF\xDF\xDF") != 'ARM':
518520
case PHP_INT_SIZE == 8:
519521
define('CRYPT_BASE_USE_REG_INTVAL', true);

‎phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ function isValidEngine($engine)
445445
// quoting https://www.openssl.org/news/openssl-3.0-notes.html, OpenSSL 3.0.1
446446
// "Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2, RC4, RC5, and DES to the legacy provider"
447447
// in theory openssl_get_cipher_methods() should catch this but, on GitHub Actions, at least, it does not
448-
if (version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
448+
if (defined('OPENSSL_VERSION_TEXT') && version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
449449
return false;
450450
}
451451
if (version_compare(PHP_VERSION, '5.3.7') < 0 && $this->key_length != 16) {
@@ -762,7 +762,7 @@ function _encryptBlock($in)
762762
$l = $in[1];
763763
$r = $in[2];
764764

765-
list($r, $l) = CRYPT_BASE_USE_REG_INTVAL ?
765+
list($r, $l) = PHP_INT_SIZE === 8 ?
766766
$this->_encryptBlockHelperFast($l, $r, $sb_0, $sb_1, $sb_2, $sb_3, $p) :
767767
$this->_encryptBlockHelperSlow($l, $r, $sb_0, $sb_1, $sb_2, $sb_3, $p);
768768

@@ -820,25 +820,26 @@ function _encryptBlockHelperFast($x0, $x1, $sbox0, $sbox1, $sbox2, $sbox3, $p)
820820
*/
821821
function _encryptBlockHelperSlow($x0, $x1, $sbox0, $sbox1, $sbox2, $sbox3, $p)
822822
{
823+
// -16777216 == intval(0xFF000000) on 32-bit PHP installs
823824
$x0^= $p[0];
824-
$x1^= $this->safe_intval(($this->safe_intval($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[1];
825-
$x0^= $this->safe_intval(($this->safe_intval($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[2];
826-
$x1^= $this->safe_intval(($this->safe_intval($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[3];
827-
$x0^= $this->safe_intval(($this->safe_intval($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[4];
828-
$x1^= $this->safe_intval(($this->safe_intval($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[5];
829-
$x0^= $this->safe_intval(($this->safe_intval($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[6];
830-
$x1^= $this->safe_intval(($this->safe_intval($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[7];
831-
$x0^= $this->safe_intval(($this->safe_intval($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[8];
832-
$x1^= $this->safe_intval(($this->safe_intval($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[9];
833-
$x0^= $this->safe_intval(($this->safe_intval($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[10];
834-
$x1^= $this->safe_intval(($this->safe_intval($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[11];
835-
$x0^= $this->safe_intval(($this->safe_intval($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[12];
836-
$x1^= $this->safe_intval(($this->safe_intval($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[13];
837-
$x0^= $this->safe_intval(($this->safe_intval($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[14];
838-
$x1^= $this->safe_intval(($this->safe_intval($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[15];
839-
$x0^= $this->safe_intval(($this->safe_intval($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[16];
840-
841-
return array($x1 & 0xFFFFFFFF ^ $p[17], $x0 & 0xFFFFFFFF);
825+
$x1^= $this->safe_intval(($this->safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[1];
826+
$x0^= $this->safe_intval(($this->safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[2];
827+
$x1^= $this->safe_intval(($this->safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[3];
828+
$x0^= $this->safe_intval(($this->safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[4];
829+
$x1^= $this->safe_intval(($this->safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[5];
830+
$x0^= $this->safe_intval(($this->safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[6];
831+
$x1^= $this->safe_intval(($this->safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[7];
832+
$x0^= $this->safe_intval(($this->safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[8];
833+
$x1^= $this->safe_intval(($this->safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[9];
834+
$x0^= $this->safe_intval(($this->safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[10];
835+
$x1^= $this->safe_intval(($this->safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[11];
836+
$x0^= $this->safe_intval(($this->safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[12];
837+
$x1^= $this->safe_intval(($this->safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[13];
838+
$x0^= $this->safe_intval(($this->safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[14];
839+
$x1^= $this->safe_intval(($this->safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[15];
840+
$x0^= $this->safe_intval(($this->safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[16];
841+
842+
return array($x1 ^ $p[17], $x0);
842843
}
843844

844845
/**

‎phpseclib/phpseclib/phpseclib/Crypt/DES.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ function isValidEngine($engine)
595595
// quoting https://www.openssl.org/news/openssl-3.0-notes.html, OpenSSL 3.0.1
596596
// "Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2, RC4, RC5, and DES to the legacy provider"
597597
// in theory openssl_get_cipher_methods() should catch this but, on GitHub Actions, at least, it does not
598-
if (version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
598+
if (defined('OPENSSL_VERSION_TEXT') && version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
599599
return false;
600600
}
601601
$this->cipher_name_openssl_ecb = 'des-ecb';

‎phpseclib/phpseclib/phpseclib/Crypt/Hash.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ function _add()
866866
$result+= $argument < 0 ? ($argument & 0x7FFFFFFF) + 0x80000000 : $argument;
867867
}
868868

869-
if ((php_uname('m') & "\xDF\xDF\xDF") != 'ARM') {
869+
if (function_exists('php_uname') && is_string(php_uname('m')) && (php_uname('m') & "\xDF\xDF\xDF") != 'ARM') {
870870
return fmod($result, $mod);
871871
}
872872

‎phpseclib/phpseclib/phpseclib/Crypt/RC2.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ function isValidEngine($engine)
276276
// quoting https://www.openssl.org/news/openssl-3.0-notes.html, OpenSSL 3.0.1
277277
// "Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2, RC4, RC5, and DES to the legacy provider"
278278
// in theory openssl_get_cipher_methods() should catch this but, on GitHub Actions, at least, it does not
279-
if (version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
279+
if (defined('OPENSSL_VERSION_TEXT') && version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
280280
return false;
281281
}
282282
if ($this->current_key_length != 128 || strlen($this->orig_key) < 16) {

‎phpseclib/phpseclib/phpseclib/Crypt/RC4.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ function isValidEngine($engine)
148148
// quoting https://www.openssl.org/news/openssl-3.0-notes.html, OpenSSL 3.0.1
149149
// "Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2, RC4, RC5, and DES to the legacy provider"
150150
// in theory openssl_get_cipher_methods() should catch this but, on GitHub Actions, at least, it does not
151-
if (version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
151+
if (defined('OPENSSL_VERSION_TEXT') && version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
152152
return false;
153153
}
154154
if (version_compare(PHP_VERSION, '5.3.7') >= 0) {

‎phpseclib/phpseclib/phpseclib/Crypt/RSA.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,7 @@ function createKey($bits = 1024, $timeout = false, $partial = array())
570570
$publickey = call_user_func_array(array($this, '_convertPublicKey'), array_values($this->_parseKey($publickey, self::PUBLIC_FORMAT_PKCS1)));
571571

572572
// clear the buffer of error strings stemming from a minimalistic openssl.cnf
573+
// https://github.com/php/php-src/issues/11054 talks about other errors this'll pick up
573574
while (openssl_error_string() !== false) {
574575
}
575576

0 commit comments

Comments
 (0)