From 19025cb10df857eb93c40d2fa35a672c4d4ac6a9 Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Wed, 10 Aug 2016 21:18:41 +0000 Subject: [PATCH] OpenSSL 1.1.0 compat: - move IDCONST macro outside of addition #if check. Otherwise we break compatibility with old OpenSSL 0.9.8 releases. Backport of r1755856 from trunk. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@1755869 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_private.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h index c8d802d61b6..644d644816c 100644 --- a/modules/ssl/ssl_private.h +++ b/modules/ssl/ssl_private.h @@ -135,6 +135,13 @@ #define HAVE_SSL_CONF_CMD #endif +/* session id constness */ +#if OPENSSL_VERSION_NUMBER < 0x10100000L +#define IDCONST +#else +#define IDCONST const +#endif + /** * The following features all depend on TLS extension support. * Within this block, check again for features (not version numbers). @@ -166,13 +173,6 @@ #endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L */ #endif /* if !defined(OPENSSL_NO_OCSP) && defined(SSL_CTX_set_tlsext_status_cb) */ -/* session id constness */ -#if OPENSSL_VERSION_NUMBER < 0x10100000L -#define IDCONST -#else -#define IDCONST const -#endif - /* TLS session tickets */ #if defined(SSL_CTX_set_tlsext_ticket_key_cb) #define HAVE_TLS_SESSION_TICKETS -- 2.47.2