Ticket #12575: boost-1.62-asio-libressl.patch
File boost-1.62-asio-libressl.patch, 2.1 KB (added by , 6 years ago) |
---|
-
(a) a/boost/asio/ssl/impl/context.ipp.orig vs. (b) b/boost/asio/ssl/impl/context.ipp
a b 228 228 { 229 229 if (handle_) 230 230 { 231 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) 231 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) 232 232 void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); 233 233 #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) 234 234 void* cb_userdata = handle_->default_passwd_callback_userdata; … … 578 578 bio_cleanup bio = { make_buffer_bio(chain) }; 579 579 if (bio.p) 580 580 { 581 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) 581 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) 582 582 pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); 583 583 void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); 584 584 #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) … … 682 682 { 683 683 ::ERR_clear_error(); 684 684 685 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) 685 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) 686 686 pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); 687 687 void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); 688 688 #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) … … 749 749 { 750 750 ::ERR_clear_error(); 751 751 752 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) 752 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) 753 753 pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); 754 754 void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); 755 755 #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) … … 988 988 boost::system::error_code context::do_set_password_callback( 989 989 detail::password_callback_base* callback, boost::system::error_code& ec) 990 990 { 991 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) 991 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) 992 992 void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); 993 993 ::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback); 994 994 #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)