php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  Use EVP_MD_CTX_destroy() instead of EVP_MD_CTX_free() for compatibility and consistency
This commit is contained in:
Niels Dossche
2025-12-21 22:29:37 +01:00
parent 38e8aca77d 9cde911350
commit 006788b9ef
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -34,6 +34,7 @@ PHP NEWS
. Fixed bug GH-20732 (Phar::LoadPhar undefined behavior when reading fails).
(ndossche)
. Fix SplFileInfo::openFile() in write mode. (ndossche)
. Fix build on legacy OpenSSL 1.1.0 systems. (Giovanni Giacobbi)
- Sqlite3:
. Fixed bug GH-20699 (SQLite3Result fetchArray return array|false,

8
ext/phar/util.c
View File

@@ -1923,7 +1923,7 @@ zend_result phar_create_signature(phar_archive_data *phar, php_stream *fp, char
if (!EVP_SignInit(md_ctx, mdtype)) {
EVP_PKEY_free(key);
EVP_MD_CTX_free(md_ctx);
EVP_MD_CTX_destroy(md_ctx);
efree(sigbuf);
if (error) {
spprintf(error, 0, "unable to initialize openssl signature for phar \"%s\"", phar->fname);
@@ -1934,7 +1934,7 @@ zend_result phar_create_signature(phar_archive_data *phar, php_stream *fp, char
while ((sig_len = php_stream_read(fp, (char*)buf, sizeof(buf))) > 0) {
if (!EVP_SignUpdate(md_ctx, buf, sig_len)) {
EVP_PKEY_free(key);
EVP_MD_CTX_free(md_ctx);
EVP_MD_CTX_destroy(md_ctx);
efree(sigbuf);
if (error) {
spprintf(error, 0, "unable to update the openssl signature for phar \"%s\"", phar->fname);
@@ -1945,7 +1945,7 @@ zend_result phar_create_signature(phar_archive_data *phar, php_stream *fp, char
if (!EVP_SignFinal (md_ctx, sigbuf, &siglen, key)) {
EVP_PKEY_free(key);
EVP_MD_CTX_free(md_ctx);
EVP_MD_CTX_destroy(md_ctx);
efree(sigbuf);
if (error) {
spprintf(error, 0, "unable to write phar \"%s\" with requested openssl signature", phar->fname);
@@ -1955,7 +1955,7 @@ zend_result phar_create_signature(phar_archive_data *phar, php_stream *fp, char
sigbuf[siglen] = '\0';
EVP_PKEY_free(key);
EVP_MD_CTX_free(md_ctx);
EVP_MD_CTX_destroy(md_ctx);
#else
size_t siglen;
sigbuf = NULL;