summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDorian Harmans <dorian@woohooyeah.nl>2018-03-23 21:35:35 +0100
committerDorian Harmans <dorian@woohooyeah.nl>2018-03-23 21:35:35 +0100
commit25a44dacf4114f33f3a887f358c02f4fd9938427 (patch)
treefc7f325b76c9a1be1fdcd86e125e461ee5d6c5e2
parent191e0ac84ed42b51395ff9659b4f6169a1fcb3aa (diff)
downloadirssi-25a44dacf4114f33f3a887f358c02f4fd9938427.zip
fix build with LibreSSL 2.7.0
-rw-r--r--src/core/network-openssl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 9fddf073..692c7e71 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -35,7 +35,8 @@
#include <openssl/err.h>
/* OpenSSL 1.1.0 introduced some backward-incompatible changes to the api */
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
+ (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL)
/* The two functions below could be already defined if OPENSSL_API_COMPAT is
* below the 1.1.0 version so let's do a clean start */
#undef X509_get_notBefore
@@ -47,7 +48,8 @@
/* OpenSSL 1.1.0 also introduced some useful additions to the api */
#if (OPENSSL_VERSION_NUMBER >= 0x10002000L)
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
static int X509_STORE_up_ref(X509_STORE *vfy)
{
int n;