Commit dcc4b0f

committed

Fix build when --with-openssl-legacy-provider set

It was missing proper backend init split. Closes GH-19930

1 parent 320fe29 commit dcc4b0fCopy full SHA for dcc4b0f

File tree

+32

-21

lines changed

+32

-21

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,9 @@ PHP NEWS`
`51`	`51`	`(Arnaud)`
`52`	`52`	`. Fixed bug GH-19831 (function JIT may not deref property value). (Arnaud)`
`53`	`53`
	`54`	`+- OpenSSL:`
	`55`	`+ . Fixed build when --with-openssl-legacy-provider set. (Jakub Zelenka)`
	`56`	`+`
`54`	`57`	`- MBstring:`
`55`	`58`	`. Updated Unicode data tables to Unicode 17.0. (Yuya Hamada)`
`56`	`59`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,11 +53,6 @@`
`53`	`53`	`#include <openssl/ssl.h>`
`54`	`54`	`#include <openssl/pkcs12.h>`
`55`	`55`	`#include <openssl/cms.h>`
`56`		`-#if PHP_OPENSSL_API_VERSION >= 0x30000`
`57`		`-#include <openssl/core_names.h>`
`58`		`-#include <openssl/param_build.h>`
`59`		`-#include <openssl/provider.h>`
`60`		`-#endif`
`61`	`56`
`62`	`57`	`ZEND_DECLARE_MODULE_GLOBALS(openssl)`
`63`	`58`

Lines changed: 1 addition & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -473,23 +473,8 @@ zend_result php_openssl_write_rand_file(const char * file, int egdsocket, int se`
`473`	`473`	`return SUCCESS;`
`474`	`474`	`}`
`475`	`475`
`476`		`-void php_openssl_backend_init(void)`
	`476`	`+void php_openssl_backend_init_common(void)`
`477`	`477`	`{`
`478`		`-#ifdef LIBRESSL_VERSION_NUMBER`
`479`		`- OPENSSL_config(NULL);`
`480`		`- SSL_library_init();`
`481`		`- OpenSSL_add_all_ciphers();`
`482`		`- OpenSSL_add_all_digests();`
`483`		`- OpenSSL_add_all_algorithms();`
`484`		`- SSL_load_error_strings();`
`485`		`-#else`
`486`		`-#if PHP_OPENSSL_API_VERSION >= 0x30000 && defined(LOAD_OPENSSL_LEGACY_PROVIDER)`
`487`		`- OSSL_PROVIDER_load(NULL, "legacy");`
`488`		`- OSSL_PROVIDER_load(NULL, "default");`
`489`		`-#endif`
`490`		`- OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL);`
`491`		`-#endif`
`492`		`-`
`493`	`478`	`/* Determine default SSL configuration file */`
`494`	`479`	`char *config_filename = getenv("OPENSSL_CONF");`
`495`	`480`	`if (config_filename == NULL) {`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,22 @@`
`27`	`27`	`#include <openssl/engine.h>`
`28`	`28`	`#endif`
`29`	`29`
	`30`	`+void php_openssl_backend_init(void)`
	`31`	`+{`
	`32`	`+#ifdef LIBRESSL_VERSION_NUMBER`
	`33`	`+ OPENSSL_config(NULL);`
	`34`	`+ SSL_library_init();`
	`35`	`+ OpenSSL_add_all_ciphers();`
	`36`	`+ OpenSSL_add_all_digests();`
	`37`	`+ OpenSSL_add_all_algorithms();`
	`38`	`+ SSL_load_error_strings();`
	`39`	`+#else`
	`40`	`+ OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL);`
	`41`	`+#endif`
	`42`	`+`
	`43`	`+ php_openssl_backend_init_common();`
	`44`	`+}`
	`45`	`+`
`30`	`46`	`void php_openssl_backend_shutdown(void)`
`31`	`47`	`{`
`32`	`48`	`#ifdef LIBRESSL_VERSION_NUMBER`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,18 @@`
`24`	`24`
`25`	`25`	`ZEND_EXTERN_MODULE_GLOBALS(openssl)`
`26`	`26`
	`27`	`+void php_openssl_backend_init(void)`
	`28`	`+{`
	`29`	`+#if PHP_OPENSSL_API_VERSION >= 0x30000 && defined(LOAD_OPENSSL_LEGACY_PROVIDER)`
	`30`	`+ OSSL_PROVIDER_load(NULL, "legacy");`
	`31`	`+ OSSL_PROVIDER_load(NULL, "default");`
	`32`	`+#endif`
	`33`	`+`
	`34`	`+ OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL);`
	`35`	`+`
	`36`	`+ php_openssl_backend_init_common();`
	`37`	`+}`
	`38`	`+`
`27`	`39`	`void php_openssl_backend_shutdown(void)`
`28`	`40`	`{`
`29`	`41`	`(void) 0;`

Comments

(0)