diff options
| author | Remi Collet <remi@remirepo.net> | 2024-08-26 15:40:29 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-08-26 15:40:29 +0200 |
| commit | 11cdddba8b85449e00369f581a9d535bd42b3fe2 (patch) | |
| tree | 33ffe900fa748aaf2f25286c7986bc8c73b43a6a | |
| parent | 7dd42ccef849e934e8abc91e8ecad314733d1870 (diff) | |
add backport for https://bugs.php.net/79589
error:14095126:SSL routines:ssl3_read_n:unexpected eof while reading
| -rw-r--r-- | failed.txt | 6 | ||||
| -rw-r--r-- | php-7.4.26-openssl3.patch | 36 | ||||
| -rw-r--r-- | php74.spec | 12 |
3 files changed, 47 insertions, 7 deletions
@@ -1,17 +1,17 @@ -===== 7.4.33-15 (2024-06-06) +===== 7.4.33-17 (2024-08-26) $ grep -ar 'Tests failed' /var/lib/mock/*/build.log -/var/lib/mock/el7x74/build.log:Tests failed : 0 /var/lib/mock/el8a74/build.log:Tests failed : 3 /var/lib/mock/el8x74/build.log:Tests failed : 3 /var/lib/mock/el9a74/build.log:Tests failed : 1 /var/lib/mock/el9x74/build.log:Tests failed : 1 -/var/lib/mock/fc38x74/build.log:Tests failed : 1 /var/lib/mock/fc39a74/build.log:Tests failed : 1 /var/lib/mock/fc39x74/build.log:Tests failed : 1 /var/lib/mock/fc40a74/build.log:Tests failed : 2 /var/lib/mock/fc40x74/build.log:Tests failed : 2 +/var/lib/mock/fc41a74/build.log:Tests failed : 2 +/var/lib/mock/fc41x74/build.log:Tests failed : 2 el8: diff --git a/php-7.4.26-openssl3.patch b/php-7.4.26-openssl3.patch index c23c517..aec6b96 100644 --- a/php-7.4.26-openssl3.patch +++ b/php-7.4.26-openssl3.patch @@ -2602,3 +2602,39 @@ index b136729cb5..d0fd976376 100644 -- 2.41.0 +From 74f75db0c3665677ec006cd379fd561feacffdc6 Mon Sep 17 00:00:00 2001 +From: Jakub Zelenka <bukka@php.net> +Date: Sun, 15 May 2022 13:49:17 +0100 +Subject: [PATCH] Fix bug #79589: ssl3_read_n:unexpected eof while reading + +The unexpected EOF failure was introduced in OpenSSL 3.0 to prevent +truncation attack. However there are many non complaint servers and +it is causing break for many users including potential majority +of those where the truncation attack is not applicable. For that reason +we try to keep behavior consitent with older OpenSSL versions which is +also the path chosen by some other languages and web servers. + +Closes GH-8369 +--- + NEWS | 4 ++++ + ext/openssl/tests/bug79589.phpt | 21 +++++++++++++++++++++ + ext/openssl/xp_ssl.c | 5 +++++ + 3 files changed, 30 insertions(+) + create mode 100644 ext/openssl/tests/bug79589.phpt + +diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c +index 918b3ca5b21df..ce23fb29f4296 100644 +--- a/ext/openssl/xp_ssl.c ++++ b/ext/openssl/xp_ssl.c +@@ -1652,6 +1652,11 @@ int php_openssl_setup_crypto(php_stream *stream, + + ssl_ctx_options &= ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS; + ++#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF ++ /* Only for OpenSSL 3+ to keep OpenSSL 1.1.1 behavior */ ++ ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF; ++#endif ++ + if (!GET_VER_OPT("disable_compression") || zend_is_true(val)) { + ssl_ctx_options |= SSL_OP_NO_COMPRESSION; + } @@ -25,10 +25,10 @@ %global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock) %ifarch aarch64 -%global oraclever 19.23 +%global oraclever 19.24 %global oraclemax 20 %global oraclelib 19.1 -%global oracledir 19.23 +%global oracledir 19.24 %else %global oraclever 23.5 %global oraclemax 24 @@ -111,7 +111,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{rcver}} -Release: 16%{?dist} +Release: 17%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -2228,7 +2228,11 @@ EOF %changelog -* Wed Jul 31 2024 Remi Collet <remi@remirepo.net> - 7.4.33-15 +* Mon Aug 26 2024 Remi Collet <remi@remirepo.net> - 7.4.33-17 +- add backport for https://bugs.php.net/79589 + error:14095126:SSL routines:ssl3_read_n:unexpected eof while reading + +* Wed Jul 31 2024 Remi Collet <remi@remirepo.net> - 7.4.33-16 - use oracle client library version 23.5 on x86_64 * Tue Jun 4 2024 Remi Collet <remi@remirepo.net> - 7.4.33-15 |