0001-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. From e06cadc3b95a577e6a8bbc94f93dd063710c73a1 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Sun, 3 Apr 2022 15:25:49 +0200
  4. Subject: [PATCH] ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl
  5. Fix the following build failure with libressl:
  6. /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'?
  7. 174 | if (BIO_get_init(pBIO) == 0 || p_stream == 0 || buf == 0 || len <= 0)
  8. | ^~~~~~~~~~~~
  9. | BIO_set_init
  10. Fixes:
  11. - http://autobuild.buildroot.org/results/386afa88ac9e5e3bb65dddeabf610bb1e9bc4285
  12. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  13. [Retrieved from:
  14. https://github.com/DOCGroup/ACE_TAO/commit/e06cadc3b95a577e6a8bbc94f93dd063710c73a1]
  15. ---
  16. ACE/ace/SSL/SSL_Asynch_BIO.cpp | 6 +++---
  17. 1 file changed, 3 insertions(+), 3 deletions(-)
  18. diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp
  19. index a657d8a14e6f7..64aa14c6ab9a7 100644
  20. --- a/ace/SSL/SSL_Asynch_BIO.cpp
  21. +++ b/ace/SSL/SSL_Asynch_BIO.cpp
  22. @@ -41,7 +41,7 @@ extern "C"
  23. #define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK )
  24. -#if OPENSSL_VERSION_NUMBER < 0x10100000L
  25. +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
  26. static BIO_METHOD methods_ACE =
  27. {
  28. BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER,
  29. @@ -68,14 +68,14 @@ static BIO_METHOD methods_ACE =
  30. #else
  31. static BIO_METHOD* methods_ACE;
  32. # define BIO_set_num(b, val)
  33. -#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
  34. +#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
  35. ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  36. BIO *
  37. ACE_SSL_make_BIO (void * ssl_asynch_stream)
  38. {
  39. -#if OPENSSL_VERSION_NUMBER < 0x10100000L
  40. +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
  41. BIO * const pBIO = BIO_new (&methods_ACE);
  42. #else
  43. if (!methods_ACE)