Fix php_openssl_pkey_derive merge issue

bukka · bukka · commit c064fc4fe821 · 2025-08-09T18:25:42.000+02:00
diff --git a/ext/openssl/openssl_backend_common.c b/ext/openssl/openssl_backend_common.c
@@ -1344,7 +1344,7 @@ EVP_PKEY *php_openssl_pkey_from_zval(
 	return key;
 }
 
-static zend_string *php_openssl_pkey_derive(EVP_PKEY *key, EVP_PKEY *peer_key, size_t requested_key_size) {
+zend_string *php_openssl_pkey_derive(EVP_PKEY *key, EVP_PKEY *peer_key, size_t requested_key_size) {
 	size_t key_size = requested_key_size;
 	EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new(key, NULL);
 	if (!ctx) {
diff --git a/ext/openssl/php_openssl_backend.h b/ext/openssl/php_openssl_backend.h
@@ -190,7 +190,7 @@ X509_STORE * php_openssl_setup_verify(zval * calist, uint32_t arg_num);
 STACK_OF(X509) * php_openssl_load_all_certs_from_file(
 		char *cert_file, size_t cert_file_len, uint32_t arg_num);
 EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req);
-zend_string *php_openssl_pkey_derive(EVP_PKEY *key, EVP_PKEY *peer_key, size_t key_size);
+zend_string *php_openssl_pkey_derive(EVP_PKEY *key, EVP_PKEY *peer_key, size_t requested_key_size);
 
 #define PHP_SSL_REQ_INIT(req)		memset(req, 0, sizeof(*req))
 #define PHP_SSL_REQ_DISPOSE(req)	php_openssl_dispose_config(req)

Original file line number	Diff line number	Diff line change
`@@ -1344,7 +1344,7 @@ EVP_PKEY *php_openssl_pkey_from_zval(`
`1344`	`1344`	`return key;`
`1345`	`1345`	`}`
`1346`	`1346`
`1347`		`-static zend_string php_openssl_pkey_derive(EVP_PKEY key, EVP_PKEY *peer_key, size_t requested_key_size) {`
	`1347`	`+zend_string php_openssl_pkey_derive(EVP_PKEY key, EVP_PKEY *peer_key, size_t requested_key_size) {`
`1348`	`1348`	`size_t key_size = requested_key_size;`
`1349`	`1349`	`EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new(key, NULL);`
`1350`	`1350`	`if (!ctx) {`