[php-src] master: Merge branch 'PHP-8.5'
Weilin Du <[email protected]>
| Newsgroups | gmane.comp.php.cvs.general |
|---|---|
| Message-ID | <[email protected]> |
Author: Weilin Du (LamentXU123) Date: 2026-08-17T01:05:57+08:00 Commit: https://github.com/php/php-src/commit/26097c8c09528eb2fa94b79652bce5b2d1f2199d Raw diff: https://github.com/php/php-src/commit/26097c8c09528eb2fa94b79652bce5b2d1f2199d.diff Merge branch 'PHP-8.5' * PHP-8.5: ext/zip: Fix AES-192 and AES-256 support reporting in phpinfo() (#23319) Changed paths: M ext/zip/php_zip.c Diff: diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 7488be7828e8..f7a294425e6d 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -3319,9 +3319,9 @@ static PHP_MINFO_FUNCTION(zip) php_info_print_table_row(2, "AES-128 encryption", zip_encryption_method_supported(ZIP_EM_AES_128, 1) ? "Yes" : "No"); php_info_print_table_row(2, "AES-192 encryption", - zip_encryption_method_supported(ZIP_EM_AES_128, 1) ? "Yes" : "No"); + zip_encryption_method_supported(ZIP_EM_AES_192, 1) ? "Yes" : "No"); php_info_print_table_row(2, "AES-256 encryption", - zip_encryption_method_supported(ZIP_EM_AES_128, 1) ? "Yes" : "No"); + zip_encryption_method_supported(ZIP_EM_AES_256, 1) ? "Yes" : "No"); #endif php_info_print_table_end();