From 21e824d6aab81eb4cd8be44fb04c481fc44bdd5b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 10 Sep 2021 16:01:42 +0200
Subject: [PATCH] one more openssl 3 patch fixing build warnings

---
 php-8.0.10-openssl3.patch | 61 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/php-8.0.10-openssl3.patch b/php-8.0.10-openssl3.patch
index 0fcd2e6..9f8337e 100644
--- a/php-8.0.10-openssl3.patch
+++ b/php-8.0.10-openssl3.patch
@@ -4572,3 +4572,64 @@ index 9e31f76998..d8102bd4bc 100644
 -- 
 2.31.1
 
+From 02f08ac888b0c5f43468eaf76b59b29a7c2d7c74 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 10 Sep 2021 11:28:20 +0200
+Subject: [PATCH] fix [-Wmaybe-uninitialized] build warnings
+
+(cherry picked from commit 6ee96f095ad947ffc820437b2e9e6449000e18a2)
+---
+ ext/openssl/openssl.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
+index d8102bd4bc..40e6e7ba97 100644
+--- a/ext/openssl/openssl.c
++++ b/ext/openssl/openssl.c
+@@ -3991,6 +3991,8 @@ static EVP_PKEY *php_openssl_pkey_init_dsa(zval *data, bool *is_private)
+ 	OPENSSL_PKEY_SET_BN(data, priv_key);
+ 	OPENSSL_PKEY_SET_BN(data, pub_key);
+ 
++	*is_private = false;
++
+ 	if (!ctx || !bld || !p || !q || !g) {
+ 		goto cleanup;
+ 	}
+@@ -4162,6 +4164,8 @@ static EVP_PKEY *php_openssl_pkey_init_dh(zval *data, bool *is_private)
+ 	OPENSSL_PKEY_SET_BN(data, priv_key);
+ 	OPENSSL_PKEY_SET_BN(data, pub_key);
+ 
++	*is_private = false;
++
+ 	if (!ctx || !bld || !p || !g) {
+ 		goto cleanup;
+ 	}
+@@ -4255,6 +4259,8 @@ static bool php_openssl_pkey_init_legacy_ec(EC_KEY *eckey, zval *data, bool *is_
+ 	zval *x;
+ 	zval *y;
+ 
++	*is_private = false;
++
+ 	if ((bn = zend_hash_str_find(Z_ARRVAL_P(data), "curve_name", sizeof("curve_name") - 1)) != NULL &&
+ 			Z_TYPE_P(bn) == IS_STRING) {
+ 		int nid = OBJ_sn2nid(Z_STRVAL_P(bn));
+@@ -4279,7 +4285,6 @@ static bool php_openssl_pkey_init_legacy_ec(EC_KEY *eckey, zval *data, bool *is_
+ 	}
+ 
+ 	// The public key 'pnt' can be calculated from 'd' or is defined by 'x' and 'y'
+-	*is_private = false;
+ 	if ((bn = zend_hash_str_find(Z_ARRVAL_P(data), "d", sizeof("d") - 1)) != NULL &&
+ 			Z_TYPE_P(bn) == IS_STRING) {
+ 		*is_private = true;
+@@ -4360,6 +4365,8 @@ static EVP_PKEY *php_openssl_pkey_init_ec(zval *data, bool *is_private) {
+ 	OPENSSL_PKEY_SET_BN(data, x);
+ 	OPENSSL_PKEY_SET_BN(data, y);
+ 
++	*is_private = false;
++
+ 	if (!ctx || !bld || !curve_name_zv || Z_TYPE_P(curve_name_zv) != IS_STRING) {
+ 		goto cleanup;
+ 	}
+-- 
+2.31.1
+