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.5'

Browse Source 
* PHP-8.5:
  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:43 +01:00
parent 0880433e61 006788b9ef
commit 9fffe41789
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ext/phar/util.c
View File

@@ -1881,7 +1881,7 @@ ZEND_ATTRIBUTE_NONNULL zend_result phar_create_signature(phar_archive_data *phar
if (!EVP_SignInit(md_ctx, mdtype)) {
EVP_PKEY_free(key);
EVP_MD_CTX_free(md_ctx);
EVP_MD_CTX_destroy(md_ctx);
efree(sigbuf);
spprintf(error, 0, "unable to initialize openssl signature for phar \"%s\"", phar->fname);
return FAILURE;
@@ -1890,7 +1890,7 @@ ZEND_ATTRIBUTE_NONNULL zend_result phar_create_signature(phar_archive_data *phar
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);
spprintf(error, 0, "unable to update the openssl signature for phar \"%s\"", phar->fname);
return FAILURE;
@@ -1899,7 +1899,7 @@ ZEND_ATTRIBUTE_NONNULL zend_result phar_create_signature(phar_archive_data *phar
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);
spprintf(error, 0, "unable to write phar \"%s\" with requested openssl signature", phar->fname);
return FAILURE;
@@ -1907,7 +1907,7 @@ ZEND_ATTRIBUTE_NONNULL zend_result phar_create_signature(phar_archive_data *phar
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;