diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/tls/asio/asio_async_base.h | 3 | ||||
-rw-r--r-- | src/lib/tls/asio/asio_async_handshake_op.h | 3 | ||||
-rw-r--r-- | src/lib/tls/asio/asio_async_read_op.h | 3 | ||||
-rw-r--r-- | src/lib/tls/asio/asio_async_write_op.h | 3 | ||||
-rw-r--r-- | src/lib/tls/asio/asio_stream_core.h | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/src/lib/tls/asio/asio_async_base.h b/src/lib/tls/asio/asio_async_base.h index 9e559f249..6585ded55 100644 --- a/src/lib/tls/asio/asio_async_base.h +++ b/src/lib/tls/asio/asio_async_base.h @@ -59,8 +59,9 @@ namespace TLS { * \tparam Allocator Type of the allocator to be used */ template <class Handler, class Executor1, class Allocator> -struct AsyncBase : boost::asio::coroutine +class AsyncBase : public boost::asio::coroutine { + public: using allocator_type = boost::asio::associated_allocator_t<Handler, Allocator>; using executor_type = boost::asio::associated_executor_t<Handler, Executor1>; diff --git a/src/lib/tls/asio/asio_async_handshake_op.h b/src/lib/tls/asio/asio_async_handshake_op.h index 92a9de7da..6bb895ff2 100644 --- a/src/lib/tls/asio/asio_async_handshake_op.h +++ b/src/lib/tls/asio/asio_async_handshake_op.h @@ -26,8 +26,9 @@ namespace Botan { namespace TLS { template <class Handler, class Stream, class Allocator = std::allocator<void>> -struct AsyncHandshakeOperation : public AsyncBase<Handler, typename Stream::executor_type, Allocator> +class AsyncHandshakeOperation : public AsyncBase<Handler, typename Stream::executor_type, Allocator> { + public: /** * Construct and invoke an AsyncHandshakeOperation. * diff --git a/src/lib/tls/asio/asio_async_read_op.h b/src/lib/tls/asio/asio_async_read_op.h index 5457a73ac..52c63cea5 100644 --- a/src/lib/tls/asio/asio_async_read_op.h +++ b/src/lib/tls/asio/asio_async_read_op.h @@ -26,8 +26,9 @@ namespace Botan { namespace TLS { template <class Handler, class Stream, class MutableBufferSequence, class Allocator = std::allocator<void>> -struct AsyncReadOperation : public AsyncBase<Handler, typename Stream::executor_type, Allocator> +class AsyncReadOperation : public AsyncBase<Handler, typename Stream::executor_type, Allocator> { + public: /** * Construct and invoke an AsyncWriteOperation. * diff --git a/src/lib/tls/asio/asio_async_write_op.h b/src/lib/tls/asio/asio_async_write_op.h index df34958e0..db347e5c5 100644 --- a/src/lib/tls/asio/asio_async_write_op.h +++ b/src/lib/tls/asio/asio_async_write_op.h @@ -25,8 +25,9 @@ namespace Botan { namespace TLS { template <typename Handler, class Stream, class Allocator = std::allocator<void>> -struct AsyncWriteOperation : public AsyncBase<Handler, typename Stream::executor_type, Allocator> +class AsyncWriteOperation : public AsyncBase<Handler, typename Stream::executor_type, Allocator> { + public: /** * Construct and invoke an AsyncWriteOperation. * diff --git a/src/lib/tls/asio/asio_stream_core.h b/src/lib/tls/asio/asio_stream_core.h index 00369ad86..dbf95c37a 100644 --- a/src/lib/tls/asio/asio_stream_core.h +++ b/src/lib/tls/asio/asio_stream_core.h @@ -28,8 +28,9 @@ namespace TLS { /** * Contains the buffers for reading/sending, and the needed botan callbacks */ -struct StreamCore : public Botan::TLS::Callbacks +class StreamCore : public Botan::TLS::Callbacks { + public: StreamCore() : m_input_buffer_space(MAX_CIPHERTEXT_SIZE, '\0'), input_buffer(m_input_buffer_space.data(), m_input_buffer_space.size()) {} |