12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152 |
- From e06cadc3b95a577e6a8bbc94f93dd063710c73a1 Mon Sep 17 00:00:00 2001
- From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
- Date: Sun, 3 Apr 2022 15:25:49 +0200
- Subject: [PATCH] ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl
- Fix the following build failure with libressl:
- /home/autobuild/autobuild/instance-10/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:174:7: error: 'BIO_get_init' was not declared in this scope; did you mean 'BIO_set_init'?
- 174 | if (BIO_get_init(pBIO) == 0 || p_stream == 0 || buf == 0 || len <= 0)
- | ^~~~~~~~~~~~
- | BIO_set_init
- Fixes:
- - http://autobuild.buildroot.org/results/386afa88ac9e5e3bb65dddeabf610bb1e9bc4285
- Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
- [Retrieved from:
- https://github.com/DOCGroup/ACE_TAO/commit/e06cadc3b95a577e6a8bbc94f93dd063710c73a1]
- ---
- ACE/ace/SSL/SSL_Asynch_BIO.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
- diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp
- index a657d8a14e6f7..64aa14c6ab9a7 100644
- --- a/ace/SSL/SSL_Asynch_BIO.cpp
- +++ b/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
- +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 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 */
- +#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
-
- ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
- BIO *
- ACE_SSL_make_BIO (void * ssl_asynch_stream)
- {
- -#if OPENSSL_VERSION_NUMBER < 0x10100000L
- +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- BIO * const pBIO = BIO_new (&methods_ACE);
- #else
- if (!methods_ACE)
|