Fix Memory corruption in openssl_encrypt with AES-WRAP-PADHEADmaster

3 files changed, 124 insertions, 3 deletions

diff --git a/failed.txt b/failed.txt
index 1b4df1e..576bdc0 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.1.33-33 (2026-05-13)
+===== 7.1.33-34 (2026-07-02)
 
 $ grep -r 'Tests failed' /var/lib/mock/scl71*/build.log
 
diff --git a/php-gh22187.patch b/php-gh22187.patch
new file mode 100644
index 0000000..181708c
--- /dev/null
+++ b/php-gh22187.patch
@@ -0,0 +1,114 @@
+From 58c39c2f8402261fd4e8ffd327c37adc53a9c861 Mon Sep 17 00:00:00 2001
+From: David Carlier <devnexen@gmail.com>
+Date: Fri, 29 May 2026 21:44:14 +0100
+Subject: [PATCH] ext/openssl: openssl_encrypt() zend mm heap overflow on
+ AES-WRAP-PAD mode.
+
+Fix #22186
+
+close GH-22187
+
+(cherry picked from commit cbc0489126a7682796aad1e5fb4e51de74af162c)
+(cherry picked from commit 95e9851111d249e43948b76663cff1baeb5e758d)
+(cherry picked from commit 2a73e91a9f9136fbbfcc9177573b6af71e3d5dce)
+(cherry picked from commit e058b01e1bd23421a425cffae9f458b0fa8db222)
+(cherry picked from commit 09cccab30d53614bb826e4390ad23ad7451b6d6c)
+(cherry picked from commit f15d1e26160a8175474160907eb6ab7e10090fa0)
+---
+ NEWS                           |  6 ++++++
+ ext/openssl/openssl.c          | 15 ++++++++++++++-
+ ext/openssl/tests/gh22186.phpt | 32 ++++++++++++++++++++++++++++++++
+ 3 files changed, 52 insertions(+), 1 deletion(-)
+ create mode 100644 ext/openssl/tests/gh22186.phpt
+
+diff --git a/NEWS b/NEWS
+index 7afe0597de9..ca517e5c959 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,6 +1,12 @@
+ PHP                                                                        NEWS
+ |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+ 
++Backported from 8.2.32
++
++- OpenSSL:
++  . Fixed bug GH-22187 (Memory corruption (zend_mm_heap corrupted) in
++    openssl_encrypt with AES-WRAP-PAD). (David Carlier)
++
+ Backported from 8.2.31
+ 
+ - FPM:
+diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
+index 72db9941d4f..5ab6f4e1924 100644
+--- a/ext/openssl/openssl.c
++++ b/ext/openssl/openssl.c
+@@ -6341,6 +6341,7 @@ static int php_openssl_cipher_update(const EVP_CIPHER *cipher_type,
+ 		char *aad, size_t aad_len, int enc)  /* {{{ */
+ {
+ 	int i = 0;
++	size_t outlen = data_len + EVP_CIPHER_block_size(cipher_type);
+ 
+ 	if (mode->is_single_run_aead && !EVP_CipherUpdate(cipher_ctx, NULL, &i, NULL, (int)data_len)) {
+ 		php_openssl_store_errors();
+@@ -6354,7 +6355,19 @@ static int php_openssl_cipher_update(const EVP_CIPHER *cipher_type,
+ 		return FAILURE;
+ 	}
+ 
+-	*poutbuf = zend_string_alloc((int)data_len + EVP_CIPHER_block_size(cipher_type), 0);
++#ifdef EVP_CIPH_WRAP_MODE
++	if ((EVP_CIPHER_mode(cipher_type)) == EVP_CIPH_WRAP_MODE) {
++		/*
++		 * RFC 5649 wrap-with-padding rounds the input up to the block size
++		 * and prepends an integrity block, we reserve one extra block.
++		 * See EVP_EncryptUpdate(3): wrap mode may write up to
++		 * inl + cipher_block_size bytes.
++		 */
++		outlen += EVP_CIPHER_block_size(cipher_type);
++	}
++#endif
++
++	*poutbuf = zend_string_alloc(outlen, 0);
+ 
+ 	if (!EVP_CipherUpdate(cipher_ctx, (unsigned char*)ZSTR_VAL(*poutbuf),
+ 					&i, (unsigned char *)data, (int)data_len)) {
+diff --git a/ext/openssl/tests/gh22186.phpt b/ext/openssl/tests/gh22186.phpt
+new file mode 100644
+index 00000000000..8f28e6c45b5
+--- /dev/null
++++ b/ext/openssl/tests/gh22186.phpt
+@@ -0,0 +1,32 @@
++--TEST--
++GH-22186 (Heap buffer overflow in openssl_encrypt with AES-WRAP-PAD)
++--EXTENSIONS--
++openssl
++--SKIPIF--
++<?php
++/* openssl_get_cipher_methods() enumerates provider ciphers, but openssl_encrypt()
++ * resolves names via the legacy EVP_get_cipherbyname(), so on some builds the
++ * cipher is listed yet not usable. Probe the actual call path instead. */
++if (!@openssl_encrypt("test", "aes-128-wrap-pad", str_repeat("k", 16),
++        OPENSSL_RAW_DATA | OPENSSL_DONT_ZERO_PAD_KEY, str_repeat("\0", 4))) {
++    die('skip aes-128-wrap-pad not usable on this OpenSSL build');
++}
++?>
++--FILE--
++<?php
++$pass = str_repeat("k", 16);
++$iv = str_repeat("\0", 4);
++
++for ($i = 1; $i < 258; $i++) {
++    $data = str_repeat("a", $i);
++    $enc = openssl_encrypt($data, 'aes-128-wrap-pad', $pass, OPENSSL_RAW_DATA | OPENSSL_DONT_ZERO_PAD_KEY, $iv);
++    $dec = openssl_decrypt($enc, 'aes-128-wrap-pad', $pass, OPENSSL_RAW_DATA | OPENSSL_DONT_ZERO_PAD_KEY, $iv);
++    if ($dec !== $data) {
++        die("mismatch at $i\n");
++    }
++}
++
++echo "done\n";
++?>
++--EXPECT--
++done
+-- 
+2.54.0
+
diff --git a/php.spec b/php.spec
index 9d51074..41a0bb7 100644
--- a/php.spec
+++ b/php.spec
@@ -135,7 +135,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 33%{?dist}
+Release: 34%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -250,11 +250,14 @@ Patch248: php-cve-2024-11234.patch
 Patch249: php-cve-2024-8932.patch
 Patch250: php-cve-2024-11233.patch
 Patch251: php-ghsa-4w77-75f9-2c8w.patch
+# from 8.2.31
 Patch252: php-cve-2026-6722.patch
 Patch253: php-cve-2026-7261.patch
 Patch254: php-cve-2026-7262.patch
 Patch255: php-cve-2026-6735.patch
 Patch256: php-cve-2026-7568.patch
+# from 8.2.32
+Patch257: php-gh22187.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -1047,6 +1050,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch -P254 -p1 -b .cve7262
 %patch -P255 -p1 -b .cve6735
 %patch -P256 -p1 -b .cve7268
+%patch -P257 -p1 -b .gh22187
 
 # Fixes for tests
 %patch -P300 -p1 -b .datetests
@@ -1826,7 +1830,7 @@ cat << EOF
 
   WARNING : PHP 7.1 have reached its "End of Life" in
   December 2019. Even, if this package includes some of
-  the important security fixes, backported from 8.1, the
+  the important security fixes, backported from 8.2, the
   UPGRADE to a maintained version is very strongly RECOMMENDED.
 
 =====================================================================
@@ -2010,6 +2014,9 @@ EOF
 
 
 %changelog
+* Thu Jul  2 2026 Remi Collet <remi@remirepo.net> - 7.1.33-34
+- Fix Memory corruption in openssl_encrypt with AES-WRAP-PAD
+
 * Tue May 12 2026 Remi Collet <remi@remirepo.net> - 7.1.33-33
 - Fix XSS within status endpoint
   CVE-2026-6735