Commit f2faa48faee for php
commit f2faa48faee81e67f507e98ae108b291bc501d41
Merge: 0ccbf27093f 9af71942c66
Author: Weilin Du <weilindu@php.net>
Date: Mon Nov 23 00:09:40 2026 +0800
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Fix GH-25528: Retain the Phar OpenSSL signing key (#25529)
diff --cc ext/phar/util.c
index a959735ceae,49932a8e384..7f94ac6286a
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@@ -2012,7 -2043,8 +2012,8 @@@ zend_result phar_create_signature(phar_
siglen = 0;
php_stream_seek(fp, 0, SEEK_END);
- if (FAILURE == phar_call_openssl_signverify(true, fp, php_stream_tell(fp), PHAR_G(openssl_privatekey), PHAR_G(openssl_privatekey_len), (char **)&sigbuf, &siglen, phar->sig_flags)) {
+ zend_string *privatekey = PHAR_G(openssl_privatekey);
- if (FAILURE == phar_call_openssl_signverify(1, fp, php_stream_tell(fp), privatekey ? ZSTR_VAL(privatekey) : NULL, privatekey ? ZSTR_LEN(privatekey) : 0, (char **)&sigbuf, &siglen, phar->sig_flags)) {
++ if (FAILURE == phar_call_openssl_signverify(true, fp, php_stream_tell(fp), privatekey ? ZSTR_VAL(privatekey) : NULL, privatekey ? ZSTR_LEN(privatekey) : 0, (char **)&sigbuf, &siglen, phar->sig_flags)) {
if (error) {
spprintf(error, 0, "unable to write phar \"%s\" with requested openssl signature", phar->fname);
}