simplify init/shutdown

Author: remicollet

ext/openssl/openssl.c

@@ -1419,11 +1419,6 @@ PHP_MSHUTDOWN_FUNCTION(openssl)
 	php_stream_xport_unregister("tlsv1.2");
 	php_stream_xport_unregister("tlsv1.3");
 
-#if PHP_OPENSSL_API_VERSION >= 0x30200
-	if (FAILURE == PHP_MSHUTDOWN(openssl_pwhash)(SHUTDOWN_FUNC_ARGS_PASSTHRU)) {
-		return FAILURE;
-	}
-#endif
 	/* reinstate the default tcp handler */
 	php_stream_xport_register("tcp", php_stream_generic_socket_factory);
 

ext/openssl/openssl.stub.php

@@ -678,3 +678,8 @@ function openssl_spki_export_challenge(string $spki): string|false {}
  * @refcount 1
  */
 function openssl_get_cert_locations(): array {}
+
+#if PHP_OPENSSL_API_VERSION >= 0x30200
+function openssl_password_hash(string $algo, #[\SensitiveParameter] string $password, array $options = []): string {}
+function openssl_password_verify(string $algo, #[\SensitiveParameter] string $password, string $hash): bool {}
+#endif

ext/openssl/openssl_arginfo.h

@@ -383,8 +383,6 @@ PHP_MINIT_FUNCTION(openssl_pwhash)
 {
 	zend_string *argon2i = ZSTR_INIT_LITERAL("argon2i", 1);
 
-	zend_register_functions(NULL, ext_functions, NULL, type);
-
 	if (php_password_algo_find(argon2i)) {
 		/* Nothing to do. Core or sodium has registered these algorithms for us. */
 		zend_string_release(argon2i);
@@ -403,11 +401,4 @@ PHP_MINIT_FUNCTION(openssl_pwhash)
 
 	return SUCCESS;
 }
-
-PHP_MSHUTDOWN_FUNCTION(openssl_pwhash)
-{
-	zend_unregister_functions(ext_functions, -1, NULL);
-
-	return SUCCESS;
-}
 #endif /* PHP_OPENSSL_API_VERSION >= 0x30200 */

ext/openssl/openssl_pwhash.c

@@ -30,8 +30,5 @@
  * @var string
  */
 const PASSWORD_ARGON2_PROVIDER = "openssl";
-
-function openssl_password_hash(string $algo, #[\SensitiveParameter] string $password, array $options = []): string {}
-function openssl_password_verify(string $algo, #[\SensitiveParameter] string $password, string $hash): bool {}
 #endif
 

ext/openssl/openssl_pwhash.stub.php

@@ -191,7 +191,6 @@ PHP_GINIT_FUNCTION(openssl);
 PHP_GSHUTDOWN_FUNCTION(openssl);
 #if PHP_OPENSSL_API_VERSION >= 0x30200
 PHP_MINIT_FUNCTION(openssl_pwhash);
-PHP_MSHUTDOWN_FUNCTION(openssl_pwhash);
 #endif
 
 #ifdef PHP_WIN32