|
Added
Link Here
|
| 1 |
--- asio/asio/ssl/impl/context.ipp.orig 2022-11-02 07:09:14.000000000 +0100 |
| 2 |
+++ asio/asio/ssl/impl/context.ipp 2023-02-24 13:21:18.708505000 +0100 |
| 3 |
@@ -387,7 +387,7 @@ |
| 4 |
if (handle_) |
| 5 |
{ |
| 6 |
#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 7 |
- && !defined(LIBRESSL_VERSION_NUMBER)) \ |
| 8 |
+ && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) \ |
| 9 |
|| defined(ASIO_USE_WOLFSSL) |
| 10 |
void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); |
| 11 |
#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
| 12 |
@@ -400,7 +400,7 @@ |
| 13 |
cb_userdata); |
| 14 |
delete callback; |
| 15 |
#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 16 |
- && !defined(LIBRESSL_VERSION_NUMBER)) \ |
| 17 |
+ && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) \ |
| 18 |
|| defined(ASIO_USE_WOLFSSL) |
| 19 |
::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0); |
| 20 |
#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) |
| 21 |
@@ -739,7 +739,7 @@ |
| 22 |
if (bio.p) |
| 23 |
{ |
| 24 |
#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 25 |
- && !defined(LIBRESSL_VERSION_NUMBER)) \ |
| 26 |
+ && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) \ |
| 27 |
|| defined(ASIO_USE_WOLFSSL) |
| 28 |
pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); |
| 29 |
void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); |
| 30 |
@@ -768,7 +768,7 @@ |
| 31 |
} |
| 32 |
|
| 33 |
#if ((OPENSSL_VERSION_NUMBER >= 0x10002000L) \ |
| 34 |
- && !defined(LIBRESSL_VERSION_NUMBER)) \ |
| 35 |
+ && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) \ |
| 36 |
|| defined(ASIO_USE_WOLFSSL) |
| 37 |
::SSL_CTX_clear_chain_certs(handle_); |
| 38 |
#else |
| 39 |
@@ -847,7 +847,7 @@ |
| 40 |
::ERR_clear_error(); |
| 41 |
|
| 42 |
#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 43 |
- && !defined(LIBRESSL_VERSION_NUMBER)) \ |
| 44 |
+ && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) \ |
| 45 |
|| defined(ASIO_USE_WOLFSSL) |
| 46 |
pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); |
| 47 |
void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); |
| 48 |
@@ -916,7 +916,7 @@ |
| 49 |
::ERR_clear_error(); |
| 50 |
|
| 51 |
#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 52 |
- && !defined(LIBRESSL_VERSION_NUMBER)) \ |
| 53 |
+ && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) \ |
| 54 |
|| defined(ASIO_USE_WOLFSSL) |
| 55 |
pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); |
| 56 |
void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); |
| 57 |
@@ -1157,7 +1157,7 @@ |
| 58 |
detail::password_callback_base* callback, asio::error_code& ec) |
| 59 |
{ |
| 60 |
#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ |
| 61 |
- && !defined(LIBRESSL_VERSION_NUMBER)) \ |
| 62 |
+ && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) \ |
| 63 |
|| defined(ASIO_USE_WOLFSSL) |
| 64 |
void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); |
| 65 |
::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback); |