forked from Lainports/opnsense-ports
51 lines
1.4 KiB
Text
51 lines
1.4 KiB
Text
boost 1.70 compatibility (accepted upstream)
|
|
https://github.com/randombit/botan/pull/1881
|
|
|
|
--- src/cli/tls_http_server.cpp.orig 2019-01-04 11:14:58 UTC
|
|
+++ src/cli/tls_http_server.cpp
|
|
@@ -41,6 +41,12 @@
|
|
|
|
#include "credentials.h"
|
|
|
|
+#if BOOST_VERSION >= 107000
|
|
+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
|
|
+#else
|
|
+#define GET_IO_SERVICE(s) ((s).get_io_service())
|
|
+#endif
|
|
+
|
|
namespace Botan_CLI {
|
|
|
|
namespace {
|
|
@@ -435,7 +441,7 @@ class TLS_Asio_HTTP_Server final
|
|
session::pointer make_session()
|
|
{
|
|
return session::create(
|
|
- m_acceptor.get_io_service(),
|
|
+ GET_IO_SERVICE(m_acceptor),
|
|
m_session_manager,
|
|
m_creds,
|
|
m_policy);
|
|
--- src/cli/tls_proxy.cpp.orig 2019-01-04 11:14:58 UTC
|
|
+++ src/cli/tls_proxy.cpp
|
|
@@ -33,6 +33,12 @@
|
|
|
|
#include "credentials.h"
|
|
|
|
+#if BOOST_VERSION >= 107000
|
|
+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
|
|
+#else
|
|
+#define GET_IO_SERVICE(s) ((s).get_io_service())
|
|
+#endif
|
|
+
|
|
namespace Botan_CLI {
|
|
|
|
namespace {
|
|
@@ -370,7 +376,7 @@ class tls_proxy_server final
|
|
session::pointer make_session()
|
|
{
|
|
return session::create(
|
|
- m_acceptor.get_io_service(),
|
|
+ GET_IO_SERVICE(m_acceptor),
|
|
m_session_manager,
|
|
m_creds,
|
|
m_policy,
|