From 9f4bd17edab1147379cef88111584be0781233b1 Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Fri, 12 Feb 2016 11:29:36 +0000 Subject: [PATCH] Support for OpenSSL 1.1.0: - fix copy&paste typos (wrong version number in "#if"). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729998 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_engine_kernel.c | 2 +- modules/ssl/ssl_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c index a7065cd531..770bb7e3be 100644 --- a/modules/ssl/ssl_engine_kernel.c +++ b/modules/ssl/ssl_engine_kernel.c @@ -2148,7 +2148,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 967cf4c546..6fd6e49048 100644 --- a/modules/ssl/ssl_private.h +++ b/modules/ssl/ssl_private.h @@ -448,7 +448,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 */ -- 2.40.0