From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 10 Aug 2020 20:12:00 +0000 (+0000)
Subject: Remove problematic version check for OpenSSL < 1.0.2
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1238
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1673c079052496ff8387b9d060f4566a8b45c36;p=thirdparty%2Fapache%2Fhttpd.git

Remove problematic version check for OpenSSL < 1.0.2

This addresses several concerns;

- There is no valid release of OpenSSL < 1.0.2 to incorporate security fixes,
  particularly on Windows, and particularly as vetted by the project.
- File structure of opensslv.h has changed in such as a way as to completely
  invalidate the CMake FindOpenSSL macros, so 3.0.0 cannot be determined.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1880754 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c5621fb4fd..785c3d7fcce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,18 +192,6 @@ ELSE()
   SET(APR_HAS_LDAP FALSE)
 ENDIF()
 
-# See if we have OpenSSL 1.0.2
-SET(HAVE_OPENSSL_102 FALSE)
-IF(OPENSSL_FOUND)
-  STRING(REGEX REPLACE "^1\\.([0-9]+)\\.[0-9]+" "\\1" minor_ver ${OPENSSL_VERSION})
-  STRING(REGEX REPLACE "^1\\.[0-9]+\\.([0-9]+)" "\\1" patch_ver ${OPENSSL_VERSION})
-  IF(${minor_ver} GREATER "0")
-    SET(HAVE_OPENSSL_102 TRUE)
-  ELSEIF(${patch_ver} GREATER "1")
-    SET(HAVE_OPENSSL_102 TRUE)
-  ENDIF()
-ENDIF()
-
 # See if nghttp2 exists in a configured or defaulted location
 SET(NGHTTP2_FOUND TRUE)
 IF(EXISTS "${NGHTTP2_INCLUDE_DIR}/nghttp2/nghttp2.h")
@@ -580,7 +568,6 @@ SET(mod_ssl_extra_sources
   modules/ssl/ssl_util.c             modules/ssl/ssl_util_ocsp.c
   modules/ssl/ssl_util_ssl.c         modules/ssl/ssl_util_stapling.c
 )
-SET(mod_ssl_ct_requires              HAVE_OPENSSL_102)
 IF(OPENSSL_FOUND)
   SET(mod_ssl_ct_extra_includes        ${OPENSSL_INCLUDE_DIR})
   SET(mod_ssl_ct_extra_libs            ${OPENSSL_LIBRARIES})