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

(-)devel/boost-libs/files/patch-boost_asio_ssl_impl_context.ipp (+50 lines)
Line 0 Link Here
1 
# Ticket #12575 fix compilation of software using libressl and boost asio
2 
# https://svn.boost.org/trac/boost/ticket/12575
3 
#
4 
--- boost/asio/ssl/impl/context.ipp.orig	2016-10-07 01:25:28.483581932 +0200
5 
+++ boost/asio/ssl/impl/context.ipp	2016-10-28 12:13:36.448622035 +0200
6 
@@ -228,7 +228,7 @@
7 
 {
8 
   if (handle_)
9 
   {
10 
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
11 
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
12 
     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
13 
 #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
14 
     void* cb_userdata = handle_->default_passwd_callback_userdata;
15 
@@ -578,7 +578,7 @@
16 
   bio_cleanup bio = { make_buffer_bio(chain) };
17 
   if (bio.p)
18 
   {
19 
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
20 
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
21 
     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
22 
     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
23 
 #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
24 
@@ -682,7 +682,7 @@
25 
 {
26 
   ::ERR_clear_error();
27
28 
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
29 
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
30 
     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
31 
     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
32 
 #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
33 
@@ -749,7 +749,7 @@
34 
 {
35 
   ::ERR_clear_error();
36
37 
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
38 
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
39 
     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
40 
     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
41 
 #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
42 
@@ -988,7 +988,7 @@
43 
 boost::system::error_code context::do_set_password_callback(
44 
     detail::password_callback_base* callback, boost::system::error_code& ec)
45 
 {
46 
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
47 
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
48 
   void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
49 
   ::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback);
50 
 #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)

Return to bug 214793