From: Rainer Jung <rjung@apache.org>
Date: Wed, 10 Aug 2016 20:09:06 +0000 (+0000)
Subject: Support for OpenSSL 1.1.0:
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9815f8cb55d1be80f47e272a55442f0ed6b2a003;p=thirdparty%2Fapache%2Fhttpd.git

Support for OpenSSL 1.1.0:
- fix copy&paste typos
  (wrong version number in "#if").

Backport r1729998 from trunk.


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

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 37a769eb6c3..3bfd98224b0 100644
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -2150,7 +2150,7 @@ void ssl_callback_Info(const SSL *ssl, int where, int rc)
         }
 #endif
     }
-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
     else if ((where & SSL_CB_HANDSHAKE_START) && scr->reneg_state == RENEG_ALLOW) {
         scr->reneg_state = RENEG_STARTED;
     }
diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index 40dd4e84a1d..decda378485 100644
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -460,7 +460,7 @@ typedef struct {
                          * renegotiation should be rejected */
         RENEG_ALLOW,    /* A server-initiated renegotiation is taking
                          * place (as dictated by configuration) */
-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
         RENEG_STARTED,  /* A renegotiation has started after RENEG_ALLOW */
         RENEG_DONE,     /* A renegotiation has finished after RENEG_STARTED */
         RENEG_ALERT,    /* A renegotiation has finished with an SSL Alert */