[patch] LibreSSL 2.7 fix

libressl-2.7-fix.patch (text/plain), 1.95 KB, created by Tom Li on 2018-08-24 18:42:38 UTC

diff -upr spice-gtk-0.35/spice-common/common/ssl_verify.c spice-gtk-0.35-libressl/spice-common/common/ssl_verify.c
--- spice-gtk-0.35/spice-common/common/ssl_verify.c	2018-06-16 07:52:52.842101437 +0800
+++ spice-gtk-0.35-libressl/spice-common/common/ssl_verify.c	2018-06-16 13:23:11.559751172 +0800
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <gio/gio.h>
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined (LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
 {
     return M_ASN1_STRING_data(asn1);
diff -uprN spice-gtk-0.35/src/bio-gio.c spice-gtk-0.35-libressl/src/bio-gio.c
--- spice-gtk-0.35/src/bio-gio.c	2018-05-18 20:27:55.000000000 +0800
+++ spice-gtk-0.35-libressl/src/bio-gio.c	2018-08-25 02:30:20.492004836 +0800
@@ -23,7 +23,7 @@
 #include "spice-util.h"
 #include "bio-gio.h"
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 static BIO_METHOD one_static_bio;
 
 static int BIO_meth_set_read(BIO_METHOD *biom,
diff -uprN spice-gtk-0.35/src/spice-channel.c spice-gtk-0.35-libressl/src/spice-channel.c
--- spice-gtk-0.35/src/spice-channel.c	2018-08-25 02:31:18.562836174 +0800
+++ spice-gtk-0.35-libressl/src/spice-channel.c	2018-08-25 02:34:00.741824578 +0800
@@ -55,7 +55,7 @@ static void spice_channel_reset_capabili
 static void spice_channel_send_migration_handshake(SpiceChannel *channel);
 static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
 {
     if (pkey->type != EVP_PKEY_RSA) {