Merge branch 'PHP-8.1' into PHP-8.2

Author: bukka

NEWS

@@ -26,6 +26,8 @@ PHP                                                                        NEWS
 
 - OpenSSL:
   . Fixed bug GH-9997 (OpenSSL engine clean up segfault). (Jakub Zelenka)
+  . Fixed bug GH-9064 (PHP fails to build if openssl was built with --no-ec).
+    (Jakub Zelenka)
 
 - Pcntl:
   . Fixed bug GH-9298 (Signal handler called after rshutdown leads to crash).

ext/openssl/openssl.c

@@ -4714,6 +4714,7 @@ static void php_openssl_copy_bn_param(
 	}
 }
 
+#ifdef HAVE_EVP_PKEY_EC
 static zend_string *php_openssl_get_utf8_param(
 		EVP_PKEY *pkey, const char *param, const char *name) {
 	char buf[64];
@@ -4727,6 +4728,7 @@ static zend_string *php_openssl_get_utf8_param(
 	return NULL;
 }
 #endif
+#endif
 
 /* {{{ returns an array with the key details (bits, pkey, type)*/
 PHP_FUNCTION(openssl_pkey_get_details)
@@ -4791,6 +4793,7 @@ PHP_FUNCTION(openssl_pkey_get_details)
 			php_openssl_copy_bn_param(&ary, pkey, OSSL_PKEY_PARAM_PRIV_KEY, "priv_key");
 			php_openssl_copy_bn_param(&ary, pkey, OSSL_PKEY_PARAM_PUB_KEY, "pub_key");
 			break;
+#ifdef HAVE_EVP_PKEY_EC
 		case EVP_PKEY_EC: {
 			ktype = OPENSSL_KEYTYPE_EC;
 			array_init(&ary);
@@ -4819,6 +4822,7 @@ PHP_FUNCTION(openssl_pkey_get_details)
 			php_openssl_copy_bn_param(&ary, pkey, OSSL_PKEY_PARAM_PRIV_KEY, "d");
 			break;
 		}
+#endif
 		EMPTY_SWITCH_DEFAULT_CASE();
 	}
 #else

ext/openssl/tests/bug79589.phpt

@@ -5,6 +5,7 @@ openssl
 --SKIPIF--
 <?php
 if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
+if (!defined("OPENSSL_KEYTYPE_EC")) die("skip EC disabled");
 ?>
 --FILE--
 <?php

ext/openssl/tests/ecc.phpt

@@ -3,7 +3,9 @@ openssl_*() with OPENSSL_KEYTYPE_EC
 --EXTENSIONS--
 openssl
 --SKIPIF--
-<?php if (!defined("OPENSSL_KEYTYPE_EC")) print "skip"; ?>
+<?php
+if (!defined("OPENSSL_KEYTYPE_EC")) die("skip EC disabled");
+?>
 --FILE--
 <?php
 $config =  __DIR__ . DIRECTORY_SEPARATOR . 'openssl.cnf';