mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Fix memory leak in openssl_sign() when passing invalid algorithm
This commit is contained in:
commit
d689ff63e8
3 changed files with 23 additions and 0 deletions
4
NEWS
4
NEWS
|
@ -12,6 +12,10 @@ PHP NEWS
|
|||
. Fixed imagecrop() overflow with rect argument with x/width y/heigh usage
|
||||
in gdImageCrop(). (David Carlier)
|
||||
|
||||
- OpenSSL:
|
||||
. Fix memory leak in openssl_sign() when passing invalid algorithm.
|
||||
(nielsdos)
|
||||
|
||||
- Standard:
|
||||
. Fixed bug GH-18145 (php8ts crashes in php_clear_stat_cache()).
|
||||
(Jakub Zelenka)
|
||||
|
|
|
@ -7162,6 +7162,7 @@ PHP_FUNCTION(openssl_sign)
|
|||
mdtype = php_openssl_get_evp_md_from_algo(method_long);
|
||||
}
|
||||
if (!mdtype && (!can_default_digest || method_long != 0)) {
|
||||
EVP_PKEY_free(pkey);
|
||||
php_error_docref(NULL, E_WARNING, "Unknown digest algorithm");
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
|
18
ext/openssl/tests/openssl_sign_invalid_algorithm.phpt
Normal file
18
ext/openssl/tests/openssl_sign_invalid_algorithm.phpt
Normal file
|
@ -0,0 +1,18 @@
|
|||
--TEST--
|
||||
openssl_sign: invalid algorithm
|
||||
--EXTENSIONS--
|
||||
openssl
|
||||
--FILE--
|
||||
<?php
|
||||
$dir = __DIR__;
|
||||
$file_pub = $dir . '/bug37820cert.pem';
|
||||
$file_key = $dir . '/bug37820key.pem';
|
||||
|
||||
$priv_key = file_get_contents($file_key);
|
||||
$priv_key_id = openssl_get_privatekey($priv_key);
|
||||
|
||||
$data = "some custom data";
|
||||
openssl_sign($data, $signature, $priv_key_id, "invalid algo");
|
||||
?>
|
||||
--EXPECTF--
|
||||
Warning: openssl_sign(): Unknown digest algorithm in %s on line %d
|
Loading…
Add table
Add a link
Reference in a new issue