[Spice-commits] common/ssl_verify.c

[GitLab Mirror]

 common/ssl_verify.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 638c77f3e67e84d9ee29839c98d153b5bfdb1af8
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Jun 21 06:45:38 2018 +0100

    ssl_verify: Fix build for newer LibreSSL
    
    LibreSSL 2.7 does not define ASN1_STRING_get0_data, like OpenSSL 1.1.
    This fixes https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=229044.
    Original patch from Piotr Kubaj.
    
    Reported-by: Jack L. <xxjack12xx at gmail.com>
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/common/ssl_verify.c b/common/ssl_verify.c
index 27aa5d3..0ac00a6 100644
--- a/common/ssl_verify.c
+++ b/common/ssl_verify.c
@@ -33,7 +33,8 @@
 #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 < 0x20700000)
 static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
 {
     return M_ASN1_STRING_data(asn1);