Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix LibreSSL 3.5+ #640

Open
wants to merge 5 commits into
base: 4.x
Choose a base branch
from
+14 −24
Open

Fix LibreSSL 3.5+ #640

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09e20cb
Fix build with LibreSSL
Sp1l May 8, 2021
4ab4b2a
Merge pull request #1 from Sp1l/fix-libressl
Sp1l May 8, 2021
b1d9e07
Merge branch 'codership:4.x' into 4.x
Sp1l Apr 17, 2023
84a115b
Fix build with LibreSSL
Sp1l Apr 17, 2023
51accdf
No longer required fix
Sp1l Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 14 additions & 24 deletions asio/asio/ssl/impl/context.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ context::context(context::method m)
#endif // (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(OPENSSL_NO_SSL2)

// SSL v3.
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
case context::sslv3:
handle_ = ::SSL_CTX_new(::TLS_method());
if (handle_)
Expand Down Expand Up @@ -132,7 +132,7 @@ context::context(context::method m)
#endif // defined(OPENSSL_NO_SSL3)

// TLS v1.0.
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
case context::tlsv1:
handle_ = ::SSL_CTX_new(::TLS_method());
if (handle_)
Expand Down Expand Up @@ -177,7 +177,7 @@ context::context(context::method m)
#endif // defined(SSL_TXT_TLSV1)

// TLS v1.1.
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
case context::tlsv11:
handle_ = ::SSL_CTX_new(::TLS_method());
if (handle_)
Expand Down Expand Up @@ -222,7 +222,7 @@ context::context(context::method m)
#endif // defined(SSL_TXT_TLSV1_1)

// TLS v1.2.
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
case context::tlsv12:
handle_ = ::SSL_CTX_new(::TLS_method());
if (handle_)
Expand Down Expand Up @@ -267,8 +267,7 @@ context::context(context::method m)
#endif // defined(SSL_TXT_TLSV1_2)

// TLS v1.3.
#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) \
&& !defined(LIBRESSL_VERSION_NUMBER)
#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
case context::tlsv13:
handle_ = ::SSL_CTX_new(::TLS_method());
if (handle_)
Expand All @@ -294,15 +293,13 @@ context::context(context::method m)
}
break;
#else // (OPENSSL_VERSION_NUMBER >= 0x10101000L)
// && !defined(LIBRESSL_VERSION_NUMBER)
case context::tlsv13:
case context::tlsv13_client:
case context::tlsv13_server:
asio::detail::throw_error(
asio::error::invalid_argument, "context");
break;
#endif // (OPENSSL_VERSION_NUMBER >= 0x10101000L)
// && !defined(LIBRESSL_VERSION_NUMBER)

// Any supported SSL/TLS version.
case context::sslv23:
Expand All @@ -316,7 +313,7 @@ context::context(context::method m)
break;

// Any supported TLS version.
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
case context::tls:
handle_ = ::SSL_CTX_new(::TLS_method());
if (handle_)
Expand Down Expand Up @@ -386,8 +383,7 @@ context::~context()
{
if (handle_)
{
#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
&& !defined(LIBRESSL_VERSION_NUMBER)) \
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
|| defined(ASIO_USE_WOLFSSL)
void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
Expand All @@ -399,8 +395,7 @@ 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(ASIO_USE_WOLFSSL)
::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0);
#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
Expand Down Expand Up @@ -738,8 +733,7 @@ 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(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_);
Expand Down Expand Up @@ -767,8 +761,7 @@ ASIO_SYNC_OP_VOID context::use_certificate_chain(
ASIO_SYNC_OP_VOID_RETURN(ec);
}

#if ((OPENSSL_VERSION_NUMBER >= 0x10002000L) \
&& !defined(LIBRESSL_VERSION_NUMBER)) \
#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) \
|| defined(ASIO_USE_WOLFSSL)
::SSL_CTX_clear_chain_certs(handle_);
#else
Expand Down Expand Up @@ -846,8 +839,7 @@ 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(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_);
Expand Down Expand Up @@ -915,8 +907,7 @@ 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(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_);
Expand Down Expand Up @@ -1156,9 +1147,8 @@ int context::verify_callback_function(int preverified, X509_STORE_CTX* ctx)
ASIO_SYNC_OP_VOID context::do_set_password_callback(
detail::password_callback_base* callback, asio::error_code& ec)
{
#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
&& !defined(LIBRESSL_VERSION_NUMBER)) \
|| defined(ASIO_USE_WOLFSSL)
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
|| defined(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)
Expand Down