com php-src: Automatically load OpenSSL configuration file: NEWS ext/openssl/openssl.c

Commit: 1f843a8fb50de77a3f53a6b892a46d9e0afdfdd7 Author: Jakub Zelenka <bukka@php.net> Mon, 28 Aug 2017 19:25:18 +0100 Parents: 58df6a3b61f5cb914d899fbb44eecadad8098700 Branches: PHP-7.2 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1f843a8fb50de77a3f53a6b892a46d9e0afdfdd7 Log: Automatically load OpenSSL configuration file Changed paths: M NEWS M ext/openssl/openssl.c Diff: diff --git a/NEWS b/NEWS index 507718e..3005573 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.2.0RC2 +- OpenSSL + . Automatically load OpenSSL configuration file. (Jakub Zelenka) 31 Aug 2017, PHP 7.2.0RC1 diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 72c6e1b..ce201d8 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1416,6 +1416,7 @@ PHP_MINIT_FUNCTION(openssl) le_csr = zend_register_list_destructors_ex(php_openssl_csr_free, NULL, "OpenSSL X.509 CSR", module_number); #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) + OPENSSL_config(NULL); SSL_library_init(); OpenSSL_add_all_ciphers(); OpenSSL_add_all_digests(); @@ -1428,6 +1429,8 @@ PHP_MINIT_FUNCTION(openssl) #endif SSL_load_error_strings(); +#else + OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL); #endif /* register a resource id number with OpenSSL so that we can map SSL -> stream structures in @@ -1600,6 +1603,7 @@ PHP_MSHUTDOWN_FUNCTION(openssl) CRYPTO_set_locking_callback(NULL); /* free allocated error strings */ ERR_free_strings(); + CONF_modules_free(); #endif php_unregister_url_stream_wrapper("https");