|
Added
Link Here
|
| 0 |
- |
1 |
--- boost/asio/ssl/impl/context.ipp.orig 2022-01-15 14:52:31 UTC |
|
|
2 |
+++ boost/asio/ssl/impl/context.ipp |
| 3 |
@@ -387,8 +387,7 @@ context::~context() |
| 4 |
{ |
| 5 |
if (handle_) |
| 6 |
{ |
| 7 |
-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 8 |
- && !defined(LIBRESSL_VERSION_NUMBER)) \ |
| 9 |
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 10 |
|| defined(BOOST_ASIO_USE_WOLFSSL) |
| 11 |
void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); |
| 12 |
#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
| 13 |
@@ -400,8 +399,7 @@ context::~context() |
| 14 |
static_cast<detail::password_callback_base*>( |
| 15 |
cb_userdata); |
| 16 |
delete callback; |
| 17 |
-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 18 |
- && !defined(LIBRESSL_VERSION_NUMBER)) \ |
| 19 |
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 20 |
|| defined(BOOST_ASIO_USE_WOLFSSL) |
| 21 |
::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0); |
| 22 |
#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
| 23 |
@@ -739,8 +737,7 @@ BOOST_ASIO_SYNC_OP_VOID context::use_certificate_chain |
| 24 |
bio_cleanup bio = { make_buffer_bio(chain) }; |
| 25 |
if (bio.p) |
| 26 |
{ |
| 27 |
-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 28 |
- && !defined(LIBRESSL_VERSION_NUMBER)) \ |
| 29 |
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 30 |
|| defined(BOOST_ASIO_USE_WOLFSSL) |
| 31 |
pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); |
| 32 |
void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); |
| 33 |
@@ -768,8 +765,7 @@ BOOST_ASIO_SYNC_OP_VOID context::use_certificate_chain |
| 34 |
BOOST_ASIO_SYNC_OP_VOID_RETURN(ec); |
| 35 |
} |
| 36 |
|
| 37 |
-#if ((OPENSSL_VERSION_NUMBER >= 0x10002000L) \ |
| 38 |
- && !defined(LIBRESSL_VERSION_NUMBER)) \ |
| 39 |
+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) \ |
| 40 |
|| defined(BOOST_ASIO_USE_WOLFSSL) |
| 41 |
::SSL_CTX_clear_chain_certs(handle_); |
| 42 |
#else |
| 43 |
@@ -847,8 +843,7 @@ BOOST_ASIO_SYNC_OP_VOID context::use_private_key( |
| 44 |
{ |
| 45 |
::ERR_clear_error(); |
| 46 |
|
| 47 |
-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 48 |
- && !defined(LIBRESSL_VERSION_NUMBER)) \ |
| 49 |
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 50 |
|| defined(BOOST_ASIO_USE_WOLFSSL) |
| 51 |
pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); |
| 52 |
void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); |
| 53 |
@@ -916,8 +911,7 @@ BOOST_ASIO_SYNC_OP_VOID context::use_rsa_private_key( |
| 54 |
{ |
| 55 |
::ERR_clear_error(); |
| 56 |
|
| 57 |
-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 58 |
- && !defined(LIBRESSL_VERSION_NUMBER)) \ |
| 59 |
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 60 |
|| defined(BOOST_ASIO_USE_WOLFSSL) |
| 61 |
pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); |
| 62 |
void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); |
| 63 |
@@ -1157,8 +1151,7 @@ int context::verify_callback_function(int preverified, |
| 64 |
BOOST_ASIO_SYNC_OP_VOID context::do_set_password_callback( |
| 65 |
detail::password_callback_base* callback, boost::system::error_code& ec) |
| 66 |
{ |
| 67 |
-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 68 |
- && !defined(LIBRESSL_VERSION_NUMBER)) \ |
| 69 |
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 70 |
|| defined(BOOST_ASIO_USE_WOLFSSL) |
| 71 |
void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); |
| 72 |
::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback); |