[Spice-commits] spice-common src/bio-gio.c src/spice-channel.c

[Frediano Ziglio]

 spice-common        |    2 +-
 src/bio-gio.c       |    2 +-
 src/spice-channel.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 47478f5c7b022cdddf753451a212b9ffdf7e455a
Author: Paweł Pękala <pawelbsd at gmail.com>
Date:   Tue Jan 23 09:05:52 2018 +0000

    Fix build with LibreSSL
    
    Some FreeBSD configurations can use LibreSSL instead of OpenSSL.
    The two libraries are really similar but need some minimal adjustment.
    
    Signed-off-by: Paweł Pękala <pawelbsd at gmail.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/spice-common b/spice-common
index 637621a..122be3d 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit 637621a9b99d2159b83272154b9d725cb7754e04
+Subproject commit 122be3d1f75b2f83555acb712e5c5420c9b1d6a7
diff --git a/src/bio-gio.c b/src/bio-gio.c
index 9358fae..30aa73b 100644
--- a/src/bio-gio.c
+++ b/src/bio-gio.c
@@ -23,7 +23,7 @@
 #include "spice-util.h"
 #include "bio-gio.h"
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
 static BIO_METHOD one_static_bio;
 
 static int BIO_meth_set_read(BIO_METHOD *biom,
diff --git a/src/spice-channel.c b/src/spice-channel.c
index 21f868d..1d66d05 100644
--- a/src/spice-channel.c
+++ b/src/spice-channel.c
@@ -55,7 +55,7 @@ static void spice_channel_reset_capabilities(SpiceChannel *channel);
 static void spice_channel_send_migration_handshake(SpiceChannel *channel);
 static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
 static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
 {
     if (pkey->type != EVP_PKEY_RSA) {