Skip to content

fix: remove dead openssl_free_key() code path in JwkFactory #40688

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

Open
lbajsarowicz wants to merge 1 commit into
base: 2.4-develop
Choose a base branch
from
+4 −15
Open

fix: remove dead openssl_free_key() code path in JwkFactory #40688

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
19 changes: 4 additions & 15 deletions lib/internal/Magento/Framework/Jwt/JwkFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ private function createPrivateRsa(string $key, ?string $pass, string $use, strin
{
$resource = openssl_get_privatekey($key, (string)$pass);
$keyData = openssl_pkey_get_details($resource)['rsa'];
$this->freeResource($resource);

$keysMap = [
'n' => 'n',
'e' => 'e',
Expand Down Expand Up @@ -821,7 +821,7 @@ private function createPublicRsa(string $key, string $use, string $algorithm, ?s
{
$resource = openssl_get_publickey($key);
$keyData = openssl_pkey_get_details($resource)['rsa'];
$this->freeResource($resource);

$keysMap = [
'n' => 'n',
'e' => 'e'
Expand Down Expand Up @@ -857,7 +857,7 @@ private function createPrivateEc(
): Jwk {
$resource = openssl_get_privatekey($key, (string)$pass);
$keyData = openssl_pkey_get_details($resource)['ec'];
$this->freeResource($resource);

if (!array_key_exists($keyData['curve_oid'], self::EC_CURVE_MAP)) {
throw new \RuntimeException('Unsupported EC curve');
}
Expand Down Expand Up @@ -895,7 +895,7 @@ private function createPublicEc(
): Jwk {
$resource = openssl_get_publickey($key);
$keyData = openssl_pkey_get_details($resource)['ec'];
$this->freeResource($resource);

if (!array_key_exists($keyData['curve_oid'], self::EC_CURVE_MAP)) {
throw new \RuntimeException('Unsupported EC curve');
}
Expand Down Expand Up @@ -950,15 +950,4 @@ private static function base64Decode(string $encoded): string
return $value;
}

/**
* @param mixed $resource
*
* @return void
*/
private function freeResource($resource): void
{
if (\is_resource($resource) && (version_compare(PHP_VERSION, '8.0') < 0)) {
openssl_free_key($resource);
}
}
}