From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 23 Mar 2020 17:56:10 +0000 (+0000)
Subject: Merge r1875544 from trunk:
X-Git-Tag: 2.4.43~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aceda33321d5dc98d27bc5667eaf8d4c8234ed97;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1875544 from trunk:

Fix compilation breakage with OpenSSL 1.1.0 up to 1.1.0f.
SSL_CTX_get_min_proto_version() and
SSL_CTX_get_max_proto_version() were only introduced in
1.1.0g.

Submitted by: rjung
Reviewedby: rjung, rpluem, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1875553 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 6580385e1a1..cbab6a3d4c7 100644
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -2494,7 +2494,7 @@ static int ssl_find_vhost(void *servername, conn_rec *c, server_rec *s)
          * from the ctx by hand
          */
         SSL_set_options(ssl, SSL_CTX_get_options(ctx));
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L \
+#if OPENSSL_VERSION_NUMBER >= 0x1010007fL \
         && (!defined(LIBRESSL_VERSION_NUMBER) \
             || LIBRESSL_VERSION_NUMBER >= 0x20800000L)
         /*