diff options
author | René Meusel <[email protected]> | 2019-02-19 15:20:58 +0100 |
---|---|---|
committer | Hannes Rantzsch <[email protected]> | 2019-04-16 10:47:45 +0200 |
commit | 96ffc33270ce3487bdb1290612244ad9e84e7889 (patch) | |
tree | 8e6a83161ba1c585006d6cfdba2229c1cdb2ebd3 /src/tests/unit_asio_stream.cpp | |
parent | ae8fb39545a8d574fba15b3690093edce93e7b18 (diff) |
move stream implemention into TLS namespace
Diffstat (limited to 'src/tests/unit_asio_stream.cpp')
-rw-r--r-- | src/tests/unit_asio_stream.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/tests/unit_asio_stream.cpp b/src/tests/unit_asio_stream.cpp index 91a7dc5f3..aed016005 100644 --- a/src/tests/unit_asio_stream.cpp +++ b/src/tests/unit_asio_stream.cpp @@ -33,7 +33,7 @@ bool contains(const void* a, const void* b) { return memcmp(a, b, sizeof(a)) == class MockChannel { public: - MockChannel(Botan::StreamCore& core) + MockChannel(Botan::TLS::StreamCore& core) : callbacks_(core) , bytes_till_complete_record_(TEST_DATA_SIZE) , active_(false) @@ -58,9 +58,9 @@ class MockChannel bool is_active() { return active_; } protected: - Botan::StreamCore& callbacks_; - std::size_t bytes_till_complete_record_; // number of bytes still to read before tls record is completed - bool active_; + Botan::TLS::StreamCore& callbacks_; + std::size_t bytes_till_complete_record_; // number of bytes still to read before tls record is completed + bool active_; }; /** @@ -122,6 +122,8 @@ struct MockSocket namespace Botan { +namespace TLS { + /** * A specification of StreamBase for the MockChannel used in this test. It * matches the specifications for StreamBase<Botan::TLS::Client> and @@ -146,6 +148,8 @@ class StreamBase<Botan_Tests::MockChannel> Botan_Tests::MockChannel channel_; }; +} // namespace TLS + } // namespace Botan namespace Botan_Tests { @@ -160,7 +164,7 @@ namespace Botan_Tests { */ class ASIO_Stream_Tests final : public Test { - using AsioStream = Botan::Stream<MockSocket&, MockChannel>; + using AsioStream = Botan::TLS::Stream<MockSocket&, MockChannel>; void test_sync_handshake(std::vector<Test::Result>& results) { @@ -506,7 +510,7 @@ namespace beast = boost::beast; */ class Async_Asio_Stream_Tests final : public Test { - using AsioStream = Botan::Stream<beast::test::stream&, MockChannel>; + using AsioStream = Botan::TLS::Stream<beast::test::stream&, MockChannel>; beast::string_view test_data() const { |