Sync with upstream: ext/curl

Author: petk

cmake/ext/curl/CMakeLists.txt

@@ -27,7 +27,6 @@ project(
   LANGUAGES C
 )
 
-include(CheckIncludeFiles)
 include(CheckSourceRuns)
 include(CMakeDependentOption)
 include(CMakePushCheckState)
@@ -103,7 +102,10 @@ if(
     OR (CMAKE_CROSSCOMPILING AND CMAKE_CROSSCOMPILING_EMULATOR)
   )
 )
-  message(CHECK_START "Checking if libcurl is linked against old OpenSSL < 1.1")
+  message(
+    CHECK_START
+    "Checking whether libcurl is linked against a supported OpenSSL version"
+  )
 
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_LIBRARIES CURL::libcurl)
@@ -127,21 +129,21 @@ if(
 
           int major, minor;
 
-          /* OpenSSL >= 3 */
-          if (sscanf(ptr, "OpenSSL/%d", &major) == 1 && major >= 3) {
-            return 4;
-          }
+          if (sscanf(ptr, "OpenSSL/%d.%d", &major, &minor) == 2) {
+            /* Check for 1.1.1+ (including 1.1.1a, 1.1.1b, etc.) */
+            if (
+              (major > 1)
+              || (major == 1 && minor == 1 && strncmp(ptr + 12, "1", 1) == 0)) {
+              /* OpenSSL 1.1.1+ - supported */
+              return 3;
+            }
 
-          /* OpenSSL >= 1.1 */
-          if (
-            sscanf(ptr, "OpenSSL/%d.%d", &major, &minor) == 2
-            && (major > 1 || (major == 1 && minor >= 1))
-          ) {
-            return 3;
+            /* OpenSSL 1.1.0 and earlier - unsupported */
+            return 0;
           }
 
-          /* OpenSSL < 1.1 */
           if (strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1) == 0) {
+            /* Old OpenSSL version */
             return 0;
           }
 
@@ -155,27 +157,15 @@ if(
     ]] PHP_EXT_CURL_HAS_CURL_OLD_OPENSSL)
   cmake_pop_check_state()
 
-  if(NOT PHP_EXT_CURL_HAS_CURL_OLD_OPENSSL)
+  if(PHP_EXT_CURL_HAS_CURL_OLD_OPENSSL)
     message(CHECK_FAIL "no")
+    message(
+      FATAL_ERROR
+      "libcurl is linked against an unsupported OpenSSL version. OpenSSL "
+      "${PHP_OPENSSL_MIN_VERSION} or later is required."
+    )
   else()
-    set(HAVE_CURL_OLD_OPENSSL TRUE)
     message(CHECK_PASS "yes")
-    find_package(OpenSSL ${PHP_OPENSSL_MIN_VERSION})
-    set_package_properties(
-      OpenSSL
-      PROPERTIES
-        TYPE REQUIRED
-        PURPOSE "Necessary for crypto locking callbacks in the curl extension."
-    )
-
-    target_link_libraries(php_ext_curl PRIVATE OpenSSL::Crypto)
-
-    if(TARGET OpenSSL::Crypto)
-      cmake_push_check_state(RESET)
-        set(CMAKE_REQUIRED_LIBRARIES OpenSSL::Crypto)
-        check_include_files(openssl/crypto.h HAVE_OPENSSL_CRYPTO_H)
-      cmake_pop_check_state()
-    endif()
   endif()
 endif()
 

cmake/ext/curl/cmake/config.h.in

@@ -1,8 +1,2 @@
 /* Define to 1 if the PHP extension 'curl' is available. */
 #cmakedefine HAVE_CURL 1
-
-/* Define to 1 if libcurl is linked against old OpenSSL < 1.1. */
-#cmakedefine HAVE_CURL_OLD_OPENSSL 1
-
-/* Define to 1 if you have the <openssl/crypto.h> header file. */
-#cmakedefine HAVE_OPENSSL_CRYPTO_H 1