68 lines
2.0 KiB
Diff
68 lines
2.0 KiB
Diff
|
From 86df247e4f090f984e050962ed5a4a536ec63b33 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ralf van der Enden <Ralf.vanderEnden@deltares.nl>
|
||
|
|
Date: Fri, 5 Apr 2019 14:58:14 +0200
|
||
|
|
Subject: [PATCH] boost 1.70 compatibility
|
||
|
|
|
||
|
|
Fixes issue #82
|
||
|
|
|
||
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
[Retrieved from:
|
||
|
|
https://github.com/randombit/botan/commit/f7148998ace97f2ad3a583685e6ed3c1f3b74c09]
|
||
|
|
---
|
||
|
|
src/cli/tls_http_server.cpp | 8 +++++++-
|
||
|
|
src/cli/tls_proxy.cpp | 8 +++++++-
|
||
|
|
2 files changed, 14 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/cli/tls_http_server.cpp b/src/cli/tls_http_server.cpp
|
||
|
|
index cc59a71c33..0a6428cd65 100644
|
||
|
|
--- a/src/cli/tls_http_server.cpp
|
||
|
|
+++ b/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);
|
||
|
|
diff --git a/src/cli/tls_proxy.cpp b/src/cli/tls_proxy.cpp
|
||
|
|
index 49ffbe3766..42ce156b12 100644
|
||
|
|
--- a/src/cli/tls_proxy.cpp
|
||
|
|
+++ b/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,
|