summaryrefslogtreecommitdiff
path: root/modules/ssl
diff options
context:
space:
mode:
authorGiovanni Bechis <gbechis@apache.org>2021-05-21 15:07:38 +0000
committerGiovanni Bechis <gbechis@apache.org>2021-05-21 15:07:38 +0000
commit861fd41d7f095c490d462af38e35df62d19ae997 (patch)
tree95d22670763f4c42f5a7ce6ca7762055102f55f2 /modules/ssl
parent9ce47de74a7b7746107c4eced3abd5985baf690f (diff)
downloadhttpd-861fd41d7f095c490d462af38e35df62d19ae997.tar.gz
fix build with LibreSSL [Yann Ylavic]
Github issue #188 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1890076 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ssl')
-rw-r--r--modules/ssl/ssl_private.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index 7eb9a364b0..e5d17da7ac 100644
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -137,13 +137,12 @@
SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL)
#define SSL_CTX_set_max_proto_version(ctx, version) \
SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL)
-#elif LIBRESSL_VERSION_NUMBER < 0x2070000f
+#endif /* LIBRESSL_VERSION_NUMBER < 0x2060000f */
/* LibreSSL before 2.7 declares OPENSSL_VERSION_NUMBER == 2.0 but does not
* include most changes from OpenSSL >= 1.1 (new functions, macros,
* deprecations, ...), so we have to work around this...
*/
-#define MODSSL_USE_OPENSSL_PRE_1_1_API (1)
-#endif /* LIBRESSL_VERSION_NUMBER < 0x2060000f */
+#define MODSSL_USE_OPENSSL_PRE_1_1_API (LIBRESSL_VERSION_NUMBER < 0x2070000f)
#else /* defined(LIBRESSL_VERSION_NUMBER) */
#define MODSSL_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L)
#endif