Attachment #241538 for bug #264180




--- asio/asio/ssl/impl/context.ipp.orig	2023-02-03 12:20:21 UTC
+++ asio/asio/ssl/impl/context.ipp
@@ -87,7 +87,7 @@ context::context(context::method m)
 #endif // (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(OPENSSL_NO_SSL2)
 
     // SSL v3.
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
   case context::sslv3:
     handle_ = ::SSL_CTX_new(::TLS_method());
     if (handle_)
@@ -132,7 +132,7 @@ context::context(context::method m)
 #endif // defined(OPENSSL_NO_SSL3)
 
     // TLS v1.0.
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
   case context::tlsv1:
     handle_ = ::SSL_CTX_new(::TLS_method());
     if (handle_)
@@ -177,7 +177,7 @@ context::context(context::method m)
 #endif // defined(SSL_TXT_TLSV1)
 
     // TLS v1.1.
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
   case context::tlsv11:
     handle_ = ::SSL_CTX_new(::TLS_method());
     if (handle_)
@@ -222,7 +222,7 @@ context::context(context::method m)
 #endif // defined(SSL_TXT_TLSV1_1)
 
     // TLS v1.2.
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
   case context::tlsv12:
     handle_ = ::SSL_CTX_new(::TLS_method());
     if (handle_)
@@ -267,8 +267,7 @@ context::context(context::method m)
 #endif // defined(SSL_TXT_TLSV1_2)
 
     // TLS v1.3.
-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) \
-    && !defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
   case context::tlsv13:
     handle_ = ::SSL_CTX_new(::TLS_method());
     if (handle_)
@@ -294,7 +293,6 @@ context::context(context::method m)
     }
     break;
 #else // (OPENSSL_VERSION_NUMBER >= 0x10101000L)
-      //   && !defined(LIBRESSL_VERSION_NUMBER)
   case context::tlsv13:
   case context::tlsv13_client:
   case context::tlsv13_server:
@@ -302,7 +300,6 @@ context::context(context::method m)
         asio::error::invalid_argument, "context");
     break;
 #endif // (OPENSSL_VERSION_NUMBER >= 0x10101000L)
-       //   && !defined(LIBRESSL_VERSION_NUMBER)
 
     // Any supported SSL/TLS version.
   case context::sslv23:
@@ -316,7 +313,7 @@ context::context(context::method m)
     break;
 
     // Any supported TLS version.
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
   case context::tls:
     handle_ = ::SSL_CTX_new(::TLS_method());
     if (handle_)
@@ -386,8 +383,7 @@ context::~context()
 {
   if (handle_)
   {
-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
-      && !defined(LIBRESSL_VERSION_NUMBER)) \
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
     || defined(ASIO_USE_WOLFSSL)
     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
 #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
@@ -399,8 +395,7 @@ context::~context()
         static_cast<detail::password_callback_base*>(
             cb_userdata);
       delete callback;
-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
-      && !defined(LIBRESSL_VERSION_NUMBER)) \
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
     || defined(ASIO_USE_WOLFSSL)
       ::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0);
 #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
@@ -738,8 +733,7 @@ ASIO_SYNC_OP_VOID context::use_certificate_chain(
   bio_cleanup bio = { make_buffer_bio(chain) };
   if (bio.p)
   {
-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
-      && !defined(LIBRESSL_VERSION_NUMBER)) \
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
     || defined(ASIO_USE_WOLFSSL)
     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
@@ -767,8 +761,7 @@ ASIO_SYNC_OP_VOID context::use_certificate_chain(
       ASIO_SYNC_OP_VOID_RETURN(ec);
     }
 
-#if ((OPENSSL_VERSION_NUMBER >= 0x10002000L) \
-      && !defined(LIBRESSL_VERSION_NUMBER)) \
+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) \
     || defined(ASIO_USE_WOLFSSL)
     ::SSL_CTX_clear_chain_certs(handle_);
 #else
@@ -846,8 +839,7 @@ ASIO_SYNC_OP_VOID context::use_private_key(
 {
   ::ERR_clear_error();
 
-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
-      && !defined(LIBRESSL_VERSION_NUMBER)) \
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
     || defined(ASIO_USE_WOLFSSL)
     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
@@ -915,8 +907,7 @@ ASIO_SYNC_OP_VOID context::use_rsa_private_key(
 {
   ::ERR_clear_error();
 
-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
-      && !defined(LIBRESSL_VERSION_NUMBER)) \
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
     || defined(ASIO_USE_WOLFSSL)
     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
@@ -1156,8 +1147,7 @@ int context::verify_callback_function(int preverified,
 ASIO_SYNC_OP_VOID context::do_set_password_callback(
     detail::password_callback_base* callback, asio::error_code& ec)
 {
-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
-      && !defined(LIBRESSL_VERSION_NUMBER)) \
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
     || defined(ASIO_USE_WOLFSSL)
   void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
   ::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback);

Removed Link Here

(-)a/databases/galera26/files/patch-galerautils_src_gu__asio__stream__engine.cpp (-11 lines)
1	--- galerautils/src/gu_asio_stream_engine.cpp.orig 2021-11-15 21:09:11 UTC
2	+++ galerautils/src/gu_asio_stream_engine.cpp
3	@@ -100,7 +100,7 @@ class AsioTcpStreamEngine : public gu::AsioStreamEngin
4
5	#include <openssl/ssl.h>
6
7	-#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
8	+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER)
9	#define HAVE_READ_EX
10	#define HAVE_WRITE_EX
11	#endif

Return to bug 264180

Added Link Here

(-)b/databases/galera26/files/patch-asio_asio_ssl_impl_context.ipp (+143 lines)
1	--- asio/asio/ssl/impl/context.ipp.orig 2023-02-03 12:20:21 UTC
2	+++ asio/asio/ssl/impl/context.ipp
3	@@ -87,7 +87,7 @@ context::context(context::method m)
4	#endif // (OPENSSL_VERSION_NUMBER >= 0x10100000L) \|\| defined(OPENSSL_NO_SSL2)
5
6	// SSL v3.
7	-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
8	+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
9	case context::sslv3:
10	handle_ = ::SSL_CTX_new(::TLS_method());
11	if (handle_)
12	@@ -132,7 +132,7 @@ context::context(context::method m)
13	#endif // defined(OPENSSL_NO_SSL3)
14
15	// TLS v1.0.
16	-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
17	+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
18	case context::tlsv1:
19	handle_ = ::SSL_CTX_new(::TLS_method());
20	if (handle_)
21	@@ -177,7 +177,7 @@ context::context(context::method m)
22	#endif // defined(SSL_TXT_TLSV1)
23
24	// TLS v1.1.
25	-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
26	+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
27	case context::tlsv11:
28	handle_ = ::SSL_CTX_new(::TLS_method());
29	if (handle_)
30	@@ -222,7 +222,7 @@ context::context(context::method m)
31	#endif // defined(SSL_TXT_TLSV1_1)
32
33	// TLS v1.2.
34	-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
35	+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
36	case context::tlsv12:
37	handle_ = ::SSL_CTX_new(::TLS_method());
38	if (handle_)
39	@@ -267,8 +267,7 @@ context::context(context::method m)
40	#endif // defined(SSL_TXT_TLSV1_2)
41
42	// TLS v1.3.
43	-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) \
44	- && !defined(LIBRESSL_VERSION_NUMBER)
45	+#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
46	case context::tlsv13:
47	handle_ = ::SSL_CTX_new(::TLS_method());
48	if (handle_)
49	@@ -294,7 +293,6 @@ context::context(context::method m)
50	}
51	break;
52	#else // (OPENSSL_VERSION_NUMBER >= 0x10101000L)
53	- // && !defined(LIBRESSL_VERSION_NUMBER)
54	case context::tlsv13:
55	case context::tlsv13_client:
56	case context::tlsv13_server:
57	@@ -302,7 +300,6 @@ context::context(context::method m)
58	asio::error::invalid_argument, "context");
59	break;
60	#endif // (OPENSSL_VERSION_NUMBER >= 0x10101000L)
61	- // && !defined(LIBRESSL_VERSION_NUMBER)
62
63	// Any supported SSL/TLS version.
64	case context::sslv23:
65	@@ -316,7 +313,7 @@ context::context(context::method m)
66	break;
67
68	// Any supported TLS version.
69	-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
70	+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
71	case context::tls:
72	handle_ = ::SSL_CTX_new(::TLS_method());
73	if (handle_)
74	@@ -386,8 +383,7 @@ context::~context()
75	{
76	if (handle_)
77	{
78	-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
79	- && !defined(LIBRESSL_VERSION_NUMBER)) \
80	+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
81	\|\| defined(ASIO_USE_WOLFSSL)
82	void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
83	#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
84	@@ -399,8 +395,7 @@ context::~context()
85	static_cast<detail::password_callback_base*>(
86	cb_userdata);
87	delete callback;
88	-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
89	- && !defined(LIBRESSL_VERSION_NUMBER)) \
90	+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
91	\|\| defined(ASIO_USE_WOLFSSL)
92	::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0);
93	#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
94	@@ -738,8 +733,7 @@ ASIO_SYNC_OP_VOID context::use_certificate_chain(
95	bio_cleanup bio = { make_buffer_bio(chain) };
96	if (bio.p)
97	{
98	-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
99	- && !defined(LIBRESSL_VERSION_NUMBER)) \
100	+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
101	\|\| defined(ASIO_USE_WOLFSSL)
102	pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
103	void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
104	@@ -767,8 +761,7 @@ ASIO_SYNC_OP_VOID context::use_certificate_chain(
105	ASIO_SYNC_OP_VOID_RETURN(ec);
106	}
107
108	-#if ((OPENSSL_VERSION_NUMBER >= 0x10002000L) \
109	- && !defined(LIBRESSL_VERSION_NUMBER)) \
110	+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) \
111	\|\| defined(ASIO_USE_WOLFSSL)
112	::SSL_CTX_clear_chain_certs(handle_);
113	#else
114	@@ -846,8 +839,7 @@ ASIO_SYNC_OP_VOID context::use_private_key(
115	{
116	::ERR_clear_error();
117
118	-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
119	- && !defined(LIBRESSL_VERSION_NUMBER)) \
120	+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
121	\|\| defined(ASIO_USE_WOLFSSL)
122	pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
123	void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
124	@@ -915,8 +907,7 @@ ASIO_SYNC_OP_VOID context::use_rsa_private_key(
125	{
126	::ERR_clear_error();
127
128	-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
129	- && !defined(LIBRESSL_VERSION_NUMBER)) \
130	+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
131	\|\| defined(ASIO_USE_WOLFSSL)
132	pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
133	void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
134	@@ -1156,8 +1147,7 @@ int context::verify_callback_function(int preverified,
135	ASIO_SYNC_OP_VOID context::do_set_password_callback(
136	detail::password_callback_base* callback, asio::error_code& ec)
137	{
138	-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
139	- && !defined(LIBRESSL_VERSION_NUMBER)) \
140	+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
141	\|\| defined(ASIO_USE_WOLFSSL)
142	void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
143	::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback);