Attachment #553574 for bug #669886

View | Details | Raw Unified | Return to bug 669886
Collapse All | Expand All

Lines 34-40 Link Here

(-)a/spice-common/common/ssl_verify.c (-1 / +1 lines)
34	#include <gio/gio.h>	34	#include <gio/gio.h>
35		35
36	#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined (LIBRESSL_VERSION_NUMBER)	36	#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined (LIBRESSL_VERSION_NUMBER)
37	static const unsigned char ASN1_STRING_get0_data(const ASN1_STRING asn1)	37	const unsigned char ASN1_STRING_get0_data(const ASN1_STRING asn1)
38	{	38	{
39	return M_ASN1_STRING_data(asn1);	39	return M_ASN1_STRING_data(asn1);
40	}	40	}




#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
static BIO_METHOD one_static_bio;

int BIO_meth_set_read(BIO_METHOD *biom,
                             int (*bread) (BIO *, char *, int))
{
    biom->bread = bread;
    return 1;
}

int BIO_meth_set_write(BIO_METHOD *biom,
                              int (*bwrite) (BIO *, const char *, int))
{
    biom->bwrite = bwrite;
    return 1;
}

int BIO_meth_set_puts(BIO_METHOD *biom,
                             int (*bputs) (BIO *, const char *))
{
    biom->bputs = bputs;
    return 1;
}

int BIO_meth_set_ctrl(BIO_METHOD *biom,
                             long (*ctrl) (BIO *, int, long, void *))
{
    biom->ctrl = ctrl;


#define BIO_TYPE_START 128

int BIO_get_new_index(void)
{
    static int bio_index = BIO_TYPE_START;
    return bio_index++;
}

void BIO_set_init(BIO *a, int init)
{
	a->init = init;
}

void BIO_set_data(BIO *a, void *ptr)
{
    a->ptr = ptr;
}

void *BIO_get_data(BIO *a)
{
    return a->ptr;
}

BIO_METHOD *BIO_meth_new(int type, const char *name)
{
    BIO_METHOD *biom = &one_static_bio;


    return biom;
}

void BIO_meth_free(BIO_METHOD *biom)
{
}


Lines 56-62 Link Here

(-)a/src/spice-channel.c (-1 / +1 lines)
56	static gboolean channel_connect(SpiceChannel *channel, gboolean tls);	56	static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
57		57
58	#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)	58	#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)
59	static RSA EVP_PKEY_get0_RSA(EVP_PKEY pkey)	59	RSA EVP_PKEY_get0_RSA(EVP_PKEY pkey)
60	{	60	{
61	if (pkey->type != EVP_PKEY_RSA) {	61	if (pkey->type != EVP_PKEY_RSA) {
62	return NULL;	62	return NULL;

Return to bug 669886

Lines 26-53 Link Here

(-)a/src/bio-gio.c (-10 / +10 lines)
26	#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)	26	#if OPENSSL_VERSION_NUMBER < 0x10100000 \|\| defined(LIBRESSL_VERSION_NUMBER)
27	static BIO_METHOD one_static_bio;	27	static BIO_METHOD one_static_bio;
28		28
29	static int BIO_meth_set_read(BIO_METHOD *biom,	29	int BIO_meth_set_read(BIO_METHOD *biom,
30	int (bread) (BIO , char *, int))	30	int (bread) (BIO , char *, int))
31	{	31	{
32	biom->bread = bread;	32	biom->bread = bread;
33	return 1;	33	return 1;
34	}	34	}
35		35
36	static int BIO_meth_set_write(BIO_METHOD *biom,	36	int BIO_meth_set_write(BIO_METHOD *biom,
37	int (bwrite) (BIO , const char *, int))	37	int (bwrite) (BIO , const char *, int))
38	{	38	{
39	biom->bwrite = bwrite;	39	biom->bwrite = bwrite;
40	return 1;	40	return 1;
41	}	41	}
42		42
43	static int BIO_meth_set_puts(BIO_METHOD *biom,	43	int BIO_meth_set_puts(BIO_METHOD *biom,
44	int (bputs) (BIO , const char *))	44	int (bputs) (BIO , const char *))
45	{	45	{
46	biom->bputs = bputs;	46	biom->bputs = bputs;
47	return 1;	47	return 1;
48	}	48	}
49		49
50	static int BIO_meth_set_ctrl(BIO_METHOD *biom,	50	int BIO_meth_set_ctrl(BIO_METHOD *biom,
51	long (ctrl) (BIO , int, long, void *))	51	long (ctrl) (BIO , int, long, void *))
52	{	52	{
53	biom->ctrl = ctrl;	53	biom->ctrl = ctrl;
Lines 56-83 Link Here
56		56
57	#define BIO_TYPE_START 128	57	#define BIO_TYPE_START 128
58		58
59	static int BIO_get_new_index(void)	59	int BIO_get_new_index(void)
60	{	60	{
61	static int bio_index = BIO_TYPE_START;	61	static int bio_index = BIO_TYPE_START;
62	return bio_index++;	62	return bio_index++;
63	}	63	}
64		64
65	static void BIO_set_init(BIO *a, int init)	65	void BIO_set_init(BIO *a, int init)
66	{	66	{
67	a->init = init;	67	a->init = init;
68	}	68	}
69		69
70	static void BIO_set_data(BIO a, void ptr)	70	void BIO_set_data(BIO a, void ptr)
71	{	71	{
72	a->ptr = ptr;	72	a->ptr = ptr;
73	}	73	}
74		74
75	static void BIO_get_data(BIO a)	75	void BIO_get_data(BIO a)
76	{	76	{
77	return a->ptr;	77	return a->ptr;
78	}	78	}
79		79
80	static BIO_METHOD BIO_meth_new(int type, const char name)	80	BIO_METHOD BIO_meth_new(int type, const char name)
81	{	81	{
82	BIO_METHOD *biom = &one_static_bio;	82	BIO_METHOD *biom = &one_static_bio;
83		83
Lines 86-92 Link Here
86	return biom;	86	return biom;
87	}	87	}
88		88
89	static void BIO_meth_free(BIO_METHOD *biom)	89	void BIO_meth_free(BIO_METHOD *biom)
90	{	90	{
91	}	91	}
92		92