diff options
Diffstat (limited to 'boost/asio/ssl/impl/context.ipp')
-rw-r--r-- | boost/asio/ssl/impl/context.ipp | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/boost/asio/ssl/impl/context.ipp b/boost/asio/ssl/impl/context.ipp index 0947a87564..1f9376ab5f 100644 --- a/boost/asio/ssl/impl/context.ipp +++ b/boost/asio/ssl/impl/context.ipp @@ -387,7 +387,9 @@ context::~context() { if (handle_) { -#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) +#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ + && !defined(LIBRESSL_VERSION_NUMBER)) \ + || defined(BOOST_ASIO_USE_WOLFSSL) void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) void* cb_userdata = handle_->default_passwd_callback_userdata; @@ -398,7 +400,9 @@ context::~context() static_cast<detail::password_callback_base*>( cb_userdata); delete callback; -#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) +#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ + && !defined(LIBRESSL_VERSION_NUMBER)) \ + || defined(BOOST_ASIO_USE_WOLFSSL) ::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0); #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) handle_->default_passwd_callback_userdata = 0; @@ -735,7 +739,9 @@ BOOST_ASIO_SYNC_OP_VOID context::use_certificate_chain( bio_cleanup bio = { make_buffer_bio(chain) }; if (bio.p) { -#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) +#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ + && !defined(LIBRESSL_VERSION_NUMBER)) \ + || defined(BOOST_ASIO_USE_WOLFSSL) 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) @@ -762,7 +768,9 @@ BOOST_ASIO_SYNC_OP_VOID context::use_certificate_chain( BOOST_ASIO_SYNC_OP_VOID_RETURN(ec); } -#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER) +#if ((OPENSSL_VERSION_NUMBER >= 0x10002000L) \ + && !defined(LIBRESSL_VERSION_NUMBER)) \ + || defined(BOOST_ASIO_USE_WOLFSSL) ::SSL_CTX_clear_chain_certs(handle_); #else if (handle_->extra_certs) @@ -839,7 +847,9 @@ BOOST_ASIO_SYNC_OP_VOID context::use_private_key( { ::ERR_clear_error(); -#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) +#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ + && !defined(LIBRESSL_VERSION_NUMBER)) \ + || defined(BOOST_ASIO_USE_WOLFSSL) 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) @@ -906,7 +916,9 @@ BOOST_ASIO_SYNC_OP_VOID context::use_rsa_private_key( { ::ERR_clear_error(); -#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) +#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ + && !defined(LIBRESSL_VERSION_NUMBER)) \ + || defined(BOOST_ASIO_USE_WOLFSSL) 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) @@ -1145,7 +1157,9 @@ int context::verify_callback_function(int preverified, X509_STORE_CTX* ctx) BOOST_ASIO_SYNC_OP_VOID context::do_set_password_callback( detail::password_callback_base* callback, boost::system::error_code& ec) { -#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) +#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \ + && !defined(LIBRESSL_VERSION_NUMBER)) \ + || defined(BOOST_ASIO_USE_WOLFSSL) 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) |