Skip to content

chore: backport of PR 14 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vitormattos merged 1 commit into from
Nov 13, 2025
Merged

chore: backport of PR 14 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion composer/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PSS.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ public static function load($key, $password = '')
$result['hash'] = \str_replace('id-', '', $params['hashAlgorithm']['algorithm']);
$result['MGFHash'] = \str_replace('id-', '', $params['maskGenAlgorithm']['parameters']['algorithm']);
if (isset($params['saltLength'])) {
$result['saltLength'] = (int) $params['saltLength']->toString();
if (is_int($params['saltLength'])) {
$result['saltLength'] = $params['saltLength'];
} else {
$result['saltLength'] = (int) $params['saltLength']->toString();
}
}
if (isset($key['meta'])) {
$result['meta'] = $key['meta'];
Expand Down
2 changes: 1 addition & 1 deletion composer/phpseclib/phpseclib/phpseclib/File/X509.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2127,7 +2127,7 @@ public function saveSPKAC(array $spkac, $format = self::FORMAT_PEM)
/**
* Load a Certificate Revocation List
*
* @param string $crl
* @param string|array $crl
* @param int $mode
* @return mixed
*/
Expand Down
27 changes: 27 additions & 0 deletions scoper.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,33 @@ static function (string $filePath, string $prefix, string $content): string {
$s_prefix = str_replace('\\', '\\\\', $prefix);
$content = str_replace("'phpseclib3\\\\", "'\\\\" . $s_prefix . '\\\\phpseclib3\\\\', $content);
$content = str_replace("'\\\\phpseclib3", "'\\\\" . $s_prefix . '\\\\phpseclib3', $content);

// Specific patch for Crypt/RSA/Formats/Keys/PSS.php: handle saltLength being an int or an object
if (str_contains($filePath, 'Crypt/RSA/Formats/Keys/PSS.php')) {
$search = '$result[\'saltLength\'] = (int) $params[\'saltLength\']->toString();';
$replace = <<<'PHP'
if (is_int($params['saltLength'])) {
$result['saltLength'] = $params['saltLength'];
} else {
$result['saltLength'] = (int) $params['saltLength']->toString();
}
PHP;
if (strpos($content, $search) !== false) {
$content = str_replace($search, $replace, $content);
} else {
$content = preg_replace(
'/\$result\\[\\\'saltLength\\\']\\s*=\\s*\\(int\\)\\s*\\$params\\[\\\'saltLength\\\']\\->toString\\(\\);/m',
$replace,
$content
);
}
}

// Specific patch for File/X509.php: update docblock param type for $crl to string|array
if (str_contains($filePath, 'File/X509.php')) {
$content = str_replace('@param string $crl', '@param string|array $crl', $content);
}

return $content;
},
// patchers for pdfparser
Expand Down