aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Merge pull request #865 from woohooyeah/master

Browse Source 
fix build with LibreSSL 2.7.0/2.7.1
This commit is contained in:
ailin-nemui 2018-03-27 06:47:25 +02:00 committed by GitHub
commit 9fa8c32b9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/network-openssl.c
View File

@ -35,7 +35,8 @@
#include <openssl/err.h> #include <openssl/err.h>
/* OpenSSL 1.1.0 introduced some backward-incompatible changes to the api */ /* 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 /* 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 */ * below the 1.1.0 version so let's do a clean start */
#undef X509_get_notBefore #undef X509_get_notBefore
@ -47,7 +48,8 @@
/* OpenSSL 1.1.0 also introduced some useful additions to the api */ /* OpenSSL 1.1.0 also introduced some useful additions to the api */
#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) #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) static int X509_STORE_up_ref(X509_STORE *vfy)
{ {
int n; int n;