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:
  openssl: Fix missing error propagation for BIO_printf() calls
This commit is contained in:
ndossche
2026-03-21 10:35:59 +01:00
parent 6932260386 f92d54b6b5
commit 0d7ce4c037
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -27,6 +27,7 @@ PHP NEWS
- OpenSSL: - OpenSSL:
. Fixed bug GH-21083 (Skip private_key_bits validation for EC/curve-based . Fixed bug GH-21083 (Skip private_key_bits validation for EC/curve-based
keys). (iliaal) keys). (iliaal)
. Fix missing error propagation for BIO_printf() calls. (ndossche)
- PCNTL: - PCNTL:
. Fixed signal handler installation on AIX by bumping the storage size of the . Fixed signal handler installation on AIX by bumping the storage size of the

20
ext/openssl/openssl.c
View File

@@ -2703,16 +2703,21 @@ PHP_FUNCTION(openssl_pkcs7_encrypt)
/* tack on extra headers */ /* tack on extra headers */
if (zheaders) { if (zheaders) {
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(zheaders), strindex, zcertval) { ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(zheaders), strindex, zcertval) {
int ret;
zend_string *str = zval_try_get_string(zcertval); zend_string *str = zval_try_get_string(zcertval);
if (UNEXPECTED(!str)) { if (UNEXPECTED(!str)) {
goto clean_exit; goto clean_exit;
} }
if (strindex) { if (strindex) {
BIO_printf(outfile, "%s: %s\n", ZSTR_VAL(strindex), ZSTR_VAL(str)); ret = BIO_printf(outfile, "%s: %s\n", ZSTR_VAL(strindex), ZSTR_VAL(str));
} else { } else {
BIO_printf(outfile, "%s\n", ZSTR_VAL(str)); ret = BIO_printf(outfile, "%s\n", ZSTR_VAL(str));
} }
zend_string_release(str); zend_string_release(str);
if (ret < 0) {
php_openssl_store_errors();
goto clean_exit;
}
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();
} }
@@ -2932,6 +2937,7 @@ PHP_FUNCTION(openssl_pkcs7_sign)
zend_string_release(str); zend_string_release(str);
if (ret < 0) { if (ret < 0) {
php_openssl_store_errors(); php_openssl_store_errors();
goto clean_exit;
} }
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();
} }
@@ -3332,16 +3338,21 @@ PHP_FUNCTION(openssl_cms_encrypt)
/* tack on extra headers */ /* tack on extra headers */
if (zheaders && encoding == ENCODING_SMIME) { if (zheaders && encoding == ENCODING_SMIME) {
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(zheaders), strindex, zcertval) { ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(zheaders), strindex, zcertval) {
int ret;
zend_string *str = zval_try_get_string(zcertval); zend_string *str = zval_try_get_string(zcertval);
if (UNEXPECTED(!str)) { if (UNEXPECTED(!str)) {
goto clean_exit; goto clean_exit;
} }
if (strindex) { if (strindex) {
BIO_printf(outfile, "%s: %s\n", ZSTR_VAL(strindex), ZSTR_VAL(str)); ret = BIO_printf(outfile, "%s: %s\n", ZSTR_VAL(strindex), ZSTR_VAL(str));
} else { } else {
BIO_printf(outfile, "%s\n", ZSTR_VAL(str)); ret = BIO_printf(outfile, "%s\n", ZSTR_VAL(str));
} }
zend_string_release(str); zend_string_release(str);
if (ret < 0) {
php_openssl_store_errors();
goto clean_exit;
}
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();
} }
@@ -3622,6 +3633,7 @@ PHP_FUNCTION(openssl_cms_sign)
zend_string_release(str); zend_string_release(str);
if (ret < 0) { if (ret < 0) {
php_openssl_store_errors(); php_openssl_store_errors();
goto clean_exit;
} }
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();
} }