irc/irssi: Fix build with LibreSSL 2.7

- LibreSSL 2.7 added OpenSSL 1.1 API

PR:		226925
Submitted by:	Sergey Akhmatov <sergey akhmatov ru>
Approved by:	David O'Rourke <dor.bsd xm0 uk> (maintainer)
This commit is contained in:
Bernard Spil 2018-03-26 17:13:09 +00:00
parent 27d17fab22
commit 8bdbb64888
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=465618

View File

@ -1,6 +1,16 @@
--- src/core/network-openssl.c.orig 2017-03-10 16:31:03 UTC
--- src/core/network-openssl.c.orig 2018-02-14 23:53:44 UTC
+++ src/core/network-openssl.c
@@ -434,6 +434,7 @@ static GIOChannel *irssi_ssl_get_iochann
@@ -47,7 +47,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;
@@ -476,6 +477,7 @@ static GIOChannel *irssi_ssl_get_iochann
if (SSL_CTX_set_cipher_list(ctx, ciphers) != 1)
g_warning("No valid SSL cipher suite could be selected");
}