57 lines
2.5 KiB
Diff
57 lines
2.5 KiB
Diff
|
--- boost/asio/ssl/impl/context.ipp.orig 2016-09-29 11:44:54.479184454 +0200
|
||
|
|
+++ boost/asio/ssl/impl/context.ipp 2016-09-29 11:44:56.838184575 +0200
|
||
|
|
@@ -228,7 +228,7 @@
|
||
|
|
{
|
||
|
|
if (handle_)
|
||
|
|
{
|
||
|
|
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
|
||
|
|
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
|
||
|
|
#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
|
||
|
|
void* cb_userdata = handle_->default_passwd_callback_userdata;
|
||
|
|
@@ -239,7 +239,7 @@
|
||
|
|
static_cast<detail::password_callback_base*>(
|
||
|
|
cb_userdata);
|
||
|
|
delete callback;
|
||
|
|
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
|
||
|
|
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0);
|
||
|
|
#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
|
||
|
|
handle_->default_passwd_callback_userdata = 0;
|
||
|
|
@@ -578,7 +578,7 @@
|
||
|
|
bio_cleanup bio = { make_buffer_bio(chain) };
|
||
|
|
if (bio.p)
|
||
|
|
{
|
||
|
|
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
|
||
|
|
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
|
||
|
|
void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
|
||
|
|
#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
|
||
|
|
@@ -682,7 +682,7 @@
|
||
|
|
{
|
||
|
|
::ERR_clear_error();
|
||
|
|
|
||
|
|
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
|
||
|
|
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
|
||
|
|
void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
|
||
|
|
#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
|
||
|
|
@@ -749,7 +749,7 @@
|
||
|
|
{
|
||
|
|
::ERR_clear_error();
|
||
|
|
|
||
|
|
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
|
||
|
|
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
|
||
|
|
void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
|
||
|
|
#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
|
||
|
|
@@ -988,7 +988,7 @@
|
||
|
|
boost::system::error_code context::do_set_password_callback(
|
||
|
|
detail::password_callback_base* callback, boost::system::error_code& ec)
|
||
|
|
{
|
||
|
|
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
|
||
|
|
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
|
||
|
|
void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
|
||
|
|
::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback);
|
||
|
|
#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
|