clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop support for OpenSSL < 1.1.0 on Windows

Browse Source 
PR #13498 bumped the required OpenSSL version to 1.1.1, but apparently
only for non Windows system.  We catch up somewhat by dropping support
for OpenSSL < 1.1.0 on Windows; besides completely removing detection
of old OpenSSL versions in `SETUP_OPENSSL`, we also ensure that all
bundled extension using this function do no longer accept OpenSSL <
1.1.0, to avoid to still be able to build these extensions with older
`phpize` scripts.

We do not cater to `--phar-native-ssl` yet; that might better be
addressed by #14578.

Closes GH-14973.
This commit is contained in:
Christoph M. Becker 2024-07-16 15:02:11 +02:00
parent ead679ecf8
commit f590b34530
No known key found for this signature in database
GPG Key ID: D66C9593118BCCB6
7 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -5,6 +5,9 @@ PHP NEWS
- Core:
. Fix GH-14978 (The xmlreader extension phpize build). (Peter Kokot)
- OpenSSL:
. Bumped minimum required OpenSSL version to 1.1.0. (cmb)
- Standard:
. Fix references in request_parse_body() options array. (nielsdos)

2
ext/curl/config.w32
View File

@ -15,7 +15,7 @@ if (PHP_CURL != "no") {
if (CHECK_LIB("libcurl_a.lib;libcurl.lib", "curl", PHP_CURL) &&
CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_CURL") &&
SETUP_OPENSSL("curl", PHP_CURL) > 0 &&
SETUP_OPENSSL("curl", PHP_CURL) >= 2 &&
CHECK_LIB("winmm.lib", "curl", PHP_CURL) &&
CHECK_LIB("wldap32.lib", "curl", PHP_CURL) &&
(((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) ||

2
ext/ftp/config.w32
View File

@ -8,7 +8,7 @@ if (PHP_FTP != "no") {
var ret = SETUP_OPENSSL("ftp", PHP_FTP);
if (ret > 0) {
if (ret >= 2) {
MESSAGE("Enabling SSL support for ext\\ftp");
AC_DEFINE('HAVE_FTP_SSL', 1, 'Have FTP over SSL support');
}

2
ext/ldap/config.w32
View File

@ -6,7 +6,7 @@ if (PHP_LDAP != "no") {
if (CHECK_HEADER_ADD_INCLUDE("ldap.h", "CFLAGS_LDAP", PHP_PHP_BUILD + "\\include\\openldap;" + PHP_PHP_BUILD + "\\openldap\\include;" + PHP_LDAP) &&
CHECK_HEADER_ADD_INCLUDE("lber.h", "CFLAGS_LDAP", PHP_PHP_BUILD + "\\include\\openldap;" + PHP_PHP_BUILD + "\\openldap\\include;" + PHP_LDAP) &&
SETUP_OPENSSL("ldap", PHP_LDAP) > 0 &&
SETUP_OPENSSL("ldap", PHP_LDAP) >= 2 &&
CHECK_LIB("oldap32_a.lib", "ldap", PHP_LDAP) &&
CHECK_LIB("olber32_a.lib", "ldap", PHP_LDAP)&&
CHECK_LIB("libsasl.lib", "ldap", PHP_LDAP)) {

2
ext/openssl/config.w32
View File

@ -5,7 +5,7 @@ ARG_WITH("openssl", "OpenSSL support", "no,shared");
if (PHP_OPENSSL != "no") {
var ret = SETUP_OPENSSL("openssl", PHP_OPENSSL);
if (ret > 0) {
if (ret >= 2) {
EXTENSION("openssl", "openssl.c xp_ssl.c");
AC_DEFINE("HAVE_OPENSSL_EXT", 1, "Define to 1 if the openssl extension is available.");
}

2
ext/snmp/config.w32
View File

@ -4,7 +4,7 @@ ARG_WITH("snmp", "SNMP support", "no");
if (PHP_SNMP != "no") {
if (CHECK_HEADER_ADD_INCLUDE("snmp.h", "CFLAGS_SNMP", PHP_PHP_BUILD + "\\include\\net-snmp;" + PHP_SNMP) &&
SETUP_OPENSSL("snmp", PHP_SNMP) > 0) {
SETUP_OPENSSL("snmp", PHP_SNMP) >= 2) {
if (CHECK_LIB("netsnmp.lib", "snmp", PHP_SNMP)) {
EXTENSION('snmp', 'snmp.c');
AC_DEFINE('HAVE_SNMP', 1);

8
win32/build/confutils.js
View File

@ -3664,14 +3664,8 @@ function SETUP_OPENSSL(target, path_to_check, common_name, use_env, add_dir_part
CHECK_LIB("libssl.lib", target, path_to_check) &&
CHECK_LIB("crypt32.lib", target, path_to_check, common_name) &&
CHECK_HEADER_ADD_INCLUDE("openssl/ssl.h", cflags_var, path_to_check, use_env, add_dir_part, add_to_flag_only)) {
/* Openssl 1.1.x */
/* Openssl 1.1.x or later */
return 2;
} else if (CHECK_LIB("ssleay32.lib", target, path_to_check, common_name) &&
CHECK_LIB("libeay32.lib", target, path_to_check, common_name) &&
CHECK_LIB("crypt32.lib", target, path_to_check, common_name) &&
CHECK_HEADER_ADD_INCLUDE("openssl/ssl.h", cflags_var, path_to_check, use_env, add_dir_part, add_to_flag_only)) {
/* Openssl 1.0.x and lower */
return 1;
}
return ret;