Attachment #191791 for bug #226900

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




--- openssl-compat.h.orig    2017-01-26 00:37:15.000000000 +0100
+++ openssl-compat.h 2018-03-25 00:45:32.856945000 +0100

https://github.com/libevent/libevent/commit/d057c45e8f48

--- openssl-compat.h.orig	2017-01-25 23:37:15 UTC
+++ openssl-compat.h
@@ -1,7 +1,7 @@
 #ifndef OPENSSL_COMPAT_H
 #define OPENSSL_COMPAT_H

-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )

 static inline BIO_METHOD *BIO_meth_new(int type, const char *name)
 {
@@ -24,12 +24,14 @@
 #define BIO_set_init(b, val) (b)->init = (val)
 #define BIO_set_data(b, val) (b)->ptr = (val)
 #define BIO_set_shutdown(b, val) (b)->shutdown = (val)
-#define BIO_get_init(b) (b)->init
 #define BIO_get_data(b) (b)->ptr
 #define BIO_get_shutdown(b) (b)->shutdown

 #define TLS_method SSLv23_method

-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )*/

+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+#define BIO_get_init(b) (b)->init
+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)*/
 #endif /* OPENSSL_COMPAT_H */
--- sample/https-client.c.orig	2017-01-25 23:37:15 UTC
+++ sample/https-client.c

 	uri[sizeof(uri) - 1] = '\0';
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )
 	// Initialize OpenSSL
 	SSL_library_init();
 	ERR_load_crypto_strings();

 	if (type == HTTP && ssl)
 		SSL_free(ssl);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )
 	EVP_cleanup();
 	ERR_free_strings();
 

 
 	sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
-#endif /*OPENSSL_VERSION_NUMBER < 0x10100000L */
+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )*/
 
 #ifdef _WIN32
 	WSACleanup();

 	if (use_ssl) {
 		int r;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )
 		SSL_library_init();
 		ERR_load_crypto_strings();
 		SSL_load_error_strings();

 #define HOSTNAME_MAX_SIZE 255
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )
 #define ASN1_STRING_get0_data ASN1_STRING_data
 #endif
 

 init_ssl(void)
 {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )
 	SSL_library_init();
 	ERR_load_crypto_strings();
 	SSL_load_error_strings();

Return to bug 226900

Lines 1-26 Link Here

(-)files/patch-libressl (-21 / +25 lines)
1	LibreSSL uses a synthetic version in order to force consumers to check	1	--- openssl-compat.h.orig 2017-01-26 00:37:15.000000000 +0100
2	individual features instead but API isn't compatible with OpenSSL 1.1.x.	2	+++ openssl-compat.h 2018-03-25 00:45:32.856945000 +0100
3
4	https://github.com/libevent/libevent/commit/d057c45e8f48
5
6	--- openssl-compat.h.orig 2017-01-25 23:37:15 UTC
7	+++ openssl-compat.h
8	@@ -1,7 +1,7 @@	3	@@ -1,7 +1,7 @@
9	#ifndef OPENSSL_COMPAT_H	4	#ifndef OPENSSL_COMPAT_H
10	#define OPENSSL_COMPAT_H	5	#define OPENSSL_COMPAT_H
11		6
12	-#if OPENSSL_VERSION_NUMBER < 0x10100000L	7	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
13	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)	8	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )
14		9
15	static inline BIO_METHOD BIO_meth_new(int type, const char name)	10	static inline BIO_METHOD BIO_meth_new(int type, const char name)
16	{	11	{
17	@@ -30,6 +30,6 @@ static inline BIO_METHOD *BIO_meth_new(i	12	@@ -24,12 +24,14 @@
18		13	#define BIO_set_init(b, val) (b)->init = (val)
		14	#define BIO_set_data(b, val) (b)->ptr = (val)
		15	#define BIO_set_shutdown(b, val) (b)->shutdown = (val)
		16	-#define BIO_get_init(b) (b)->init
		17	#define BIO_get_data(b) (b)->ptr
		18	#define BIO_get_shutdown(b) (b)->shutdown
		19
19	#define TLS_method SSLv23_method	20	#define TLS_method SSLv23_method
20		21
21	-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */	22	-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
22	+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER) */	23	+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )*/
23		24
		25	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
		26	+#define BIO_get_init(b) (b)->init
		27	+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)*/
24	#endif /* OPENSSL_COMPAT_H */	28	#endif /* OPENSSL_COMPAT_H */
25	--- sample/https-client.c.orig 2017-01-25 23:37:15 UTC	29	--- sample/https-client.c.orig 2017-01-25 23:37:15 UTC
26	+++ sample/https-client.c	30	+++ sample/https-client.c
Lines 29-35 Link Here
29	uri[sizeof(uri) - 1] = '\0';	33	uri[sizeof(uri) - 1] = '\0';
30		34
31	-#if OPENSSL_VERSION_NUMBER < 0x10100000L	35	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
32	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)	36	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )
33	// Initialize OpenSSL	37	// Initialize OpenSSL
34	SSL_library_init();	38	SSL_library_init();
35	ERR_load_crypto_strings();	39	ERR_load_crypto_strings();
Lines 38-44 Link Here
38	if (type == HTTP && ssl)	42	if (type == HTTP && ssl)
39	SSL_free(ssl);	43	SSL_free(ssl);
40	-#if OPENSSL_VERSION_NUMBER < 0x10100000L	44	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
41	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)	45	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )
42	EVP_cleanup();	46	EVP_cleanup();
43	ERR_free_strings();	47	ERR_free_strings();
44		48
Lines 47-53 Link Here
47		51
48	sk_SSL_COMP_free(SSL_COMP_get_compression_methods());	52	sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
49	-#endif /OPENSSL_VERSION_NUMBER < 0x10100000L /	53	-#endif /OPENSSL_VERSION_NUMBER < 0x10100000L /
50	+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER) */	54	+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )*/
51		55
52	#ifdef _WIN32	56	#ifdef _WIN32
53	WSACleanup();	57	WSACleanup();
Lines 58-64 Link Here
58	if (use_ssl) {	62	if (use_ssl) {
59	int r;	63	int r;
60	-#if OPENSSL_VERSION_NUMBER < 0x10100000L	64	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
61	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)	65	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )
62	SSL_library_init();	66	SSL_library_init();
63	ERR_load_crypto_strings();	67	ERR_load_crypto_strings();
64	SSL_load_error_strings();	68	SSL_load_error_strings();
Lines 69-75 Link Here
69	#define HOSTNAME_MAX_SIZE 255	73	#define HOSTNAME_MAX_SIZE 255
70		74
71	-#if OPENSSL_VERSION_NUMBER < 0x10100000L	75	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
72	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)	76	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )
73	#define ASN1_STRING_get0_data ASN1_STRING_data	77	#define ASN1_STRING_get0_data ASN1_STRING_data
74	#endif	78	#endif
75		79
Lines 80-86 Link Here
80	init_ssl(void)	84	init_ssl(void)
81	{	85	{
82	-#if OPENSSL_VERSION_NUMBER < 0x10100000L	86	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
83	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)	87	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )
84	SSL_library_init();	88	SSL_library_init();
85	ERR_load_crypto_strings();	89	ERR_load_crypto_strings();
86	SSL_load_error_strings();	90	SSL_load_error_strings();