diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-02-23 09:26:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-23 09:26:26 +0100 |
| commit | 7b119e54bbbcaeeec03cf2e6e7a3ff889e08fd12 (patch) | |
| tree | 74111a771f22e47a663ed8f9ac040968df8003ce | |
| parent | c0ef1f6daad33e02ff3fb8bea45936485c20a6fd (diff) | |
| parent | 3827363c2dfe94345cab759b5b968eeec89205b4 (diff) | |
| download | ATCD-7b119e54bbbcaeeec03cf2e6e7a3ff889e08fd12.tar.gz | |
Merge pull request #2053 from ffontaine/master
ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl >= 3.5.0
| -rw-r--r-- | ACE/ace/SSL/SSL_Asynch_BIO.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/SSL/SSL_Asynch_BIO.cpp b/ACE/ace/SSL/SSL_Asynch_BIO.cpp index 0faa775fc0f..0317ccbd12c 100644 --- a/ACE/ace/SSL/SSL_Asynch_BIO.cpp +++ b/ACE/ace/SSL/SSL_Asynch_BIO.cpp @@ -41,7 +41,7 @@ extern "C" #define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK ) -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) static BIO_METHOD methods_ACE = { BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER, @@ -68,14 +68,14 @@ static BIO_METHOD methods_ACE = #else static BIO_METHOD* methods_ACE; # define BIO_set_num(b, val) -#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ +#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL BIO * ACE_SSL_make_BIO (void * ssl_asynch_stream) { -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) BIO * const pBIO = BIO_new (&methods_ACE); #else if (!methods_ACE) |