[patch] patch to change static declarations to dynamic, assuring compatibility with LibreSSL 2.7.4

spice-gtk-0.35-libressl-2.7.4.patch (text/plain), 2.69 KB, created by pagorman on 2018-10-28 23:19:50 UTC

--- a/spice-common/common/ssl_verify.c	2018-10-28 18:47:47.195026159 -0400
+++ b/spice-common/common/ssl_verify.c	2018-10-28 18:48:49.604032633 -0400
@@ -34,7 +34,7 @@
 #include <gio/gio.h>
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || defined (LIBRESSL_VERSION_NUMBER)
-static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
+const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
 {
     return M_ASN1_STRING_data(asn1);
 }
--- a/src/bio-gio.c	2018-10-28 18:58:16.550091448 -0400
+++ b/src/bio-gio.c	2018-10-28 19:01:56.385114254 -0400
@@ -26,28 +26,28 @@
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
 static BIO_METHOD one_static_bio;
 
-static int BIO_meth_set_read(BIO_METHOD *biom,
+int BIO_meth_set_read(BIO_METHOD *biom,
                              int (*bread) (BIO *, char *, int))
 {
     biom->bread = bread;
     return 1;
 }
 
-static int BIO_meth_set_write(BIO_METHOD *biom,
+int BIO_meth_set_write(BIO_METHOD *biom,
                               int (*bwrite) (BIO *, const char *, int))
 {
     biom->bwrite = bwrite;
     return 1;
 }
 
-static int BIO_meth_set_puts(BIO_METHOD *biom,
+int BIO_meth_set_puts(BIO_METHOD *biom,
                              int (*bputs) (BIO *, const char *))
 {
     biom->bputs = bputs;
     return 1;
 }
 
-static int BIO_meth_set_ctrl(BIO_METHOD *biom,
+int BIO_meth_set_ctrl(BIO_METHOD *biom,
                              long (*ctrl) (BIO *, int, long, void *))
 {
     biom->ctrl = ctrl;
@@ -56,28 +56,28 @@
 
 #define BIO_TYPE_START 128
 
-static int BIO_get_new_index(void)
+int BIO_get_new_index(void)
 {
     static int bio_index = BIO_TYPE_START;
     return bio_index++;
 }
 
-static void BIO_set_init(BIO *a, int init)
+void BIO_set_init(BIO *a, int init)
 {
 	a->init = init;
 }
 
-static void BIO_set_data(BIO *a, void *ptr)
+void BIO_set_data(BIO *a, void *ptr)
 {
     a->ptr = ptr;
 }
 
-static void *BIO_get_data(BIO *a)
+void *BIO_get_data(BIO *a)
 {
     return a->ptr;
 }
 
-static BIO_METHOD *BIO_meth_new(int type, const char *name)
+BIO_METHOD *BIO_meth_new(int type, const char *name)
 {
     BIO_METHOD *biom = &one_static_bio;
 
@@ -86,7 +86,7 @@
     return biom;
 }
 
-static void BIO_meth_free(BIO_METHOD *biom)
+void BIO_meth_free(BIO_METHOD *biom)
 {
 }
 
--- a/src/spice-channel.c	2018-10-28 19:07:38.939149791 -0400
+++ b/src/spice-channel.c	2018-10-28 19:08:29.367155022 -0400
@@ -56,7 +56,7 @@
 static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
-static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
+RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
 {
     if (pkey->type != EVP_PKEY_RSA) {
         return NULL;