diff options
| author | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2018-03-27 06:47:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 06:47:25 +0200 |
| commit | 9fa8c32b9e2f80e308d1ed780490f6d2dfd6bb05 (patch) | |
| tree | 051cb9ccee5547773f3a0a8f376d27a36c465f83 | |
| parent | 7fc59d2d1016e28eced6dbcaddc1e1865fe0ebe8 (diff) | |
| parent | 17920ab5aa11be86dc15c83fce8f5d879f104ed8 (diff) | |
| download | irssi-9fa8c32b9e2f80e308d1ed780490f6d2dfd6bb05.zip | |
Merge pull request #865 from woohooyeah/master
fix build with LibreSSL 2.7.0/2.7.1
| -rw-r--r-- | src/core/network-openssl.c | 6 |
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; |