OpenSSL is required for tests and examples

CHANGELOG.md

@@ -5,6 +5,7 @@ Version 219:
 * Better treatment of SSL short reads
 * ssl_stream is a public interface
 * basic_parser is abstract, not CRTP (API Change)
+* OpenSSL is required for tests and examples
 
 --------------------------------------------------------------------------------
 

CMakeLists.txt

@@ -115,14 +115,6 @@ endif()
 
 find_package(OpenSSL)
 
-if (OPENSSL_FOUND)
-    add_definitions (-DBOOST_BEAST_USE_OPENSSL=1)
-
-else()
-    add_definitions (-DBOOST_BEAST_USE_OPENSSL=0)
-    message("OpenSSL not found.")
-endif()
-
 #
 #-------------------------------------------------------------------------------
 

example/advanced/server-flex/advanced_server_flex.cpp

@@ -17,9 +17,9 @@
 
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
+#include <boost/beast/ssl.hpp>
 #include <boost/beast/websocket.hpp>
 #include <boost/beast/version.hpp>
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/bind_executor.hpp>
 #include <boost/asio/signal_set.hpp>
 #include <boost/asio/steady_timer.hpp>

example/http/client/async-ssl/http_client_async_ssl.cpp

@@ -17,8 +17,8 @@
 
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
+#include <boost/beast/ssl.hpp>
 #include <boost/beast/version.hpp>
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <cstdlib>
 #include <functional>
 #include <iostream>

example/http/client/coro-ssl/http_client_coro_ssl.cpp

@@ -17,8 +17,8 @@
 
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
+#include <boost/beast/ssl.hpp>
 #include <boost/beast/version.hpp>
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/spawn.hpp>
 #include <cstdlib>
 #include <functional>

example/http/client/sync-ssl/http_client_sync_ssl.cpp

@@ -17,8 +17,8 @@
 
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
+#include <boost/beast/ssl.hpp>
 #include <boost/beast/version.hpp>
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/connect.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/error.hpp>

example/http/server/async-ssl/http_server_async_ssl.cpp

@@ -17,8 +17,8 @@
 
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
+#include <boost/beast/ssl.hpp>
 #include <boost/beast/version.hpp>
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/strand.hpp>
 #include <boost/config.hpp>
 #include <algorithm>

example/http/server/coro-ssl/http_server_coro_ssl.cpp

@@ -17,8 +17,8 @@
 
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
+#include <boost/beast/ssl.hpp>
 #include <boost/beast/version.hpp>
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/spawn.hpp>
 #include <boost/config.hpp>
 #include <algorithm>

example/http/server/flex/http_server_flex.cpp

@@ -17,8 +17,8 @@
 
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
+#include <boost/beast/ssl.hpp>
 #include <boost/beast/version.hpp>
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/strand.hpp>
 #include <boost/config.hpp>
 #include <algorithm>

example/http/server/stackless-ssl/http_server_stackless_ssl.cpp

@@ -17,8 +17,8 @@
 
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
+#include <boost/beast/ssl.hpp>
 #include <boost/beast/version.hpp>
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/coroutine.hpp>
 #include <boost/asio/strand.hpp>
 #include <boost/config.hpp>

example/http/server/sync-ssl/http_server_sync_ssl.cpp

@@ -17,8 +17,8 @@
 
 #include <boost/beast/core.hpp>
 #include <boost/beast/http.hpp>
+#include <boost/beast/ssl.hpp>
 #include <boost/beast/version.hpp>
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/stream.hpp>
 #include <boost/config.hpp>

example/websocket/client/async-ssl/websocket_client_async_ssl.cpp

@@ -16,9 +16,9 @@
 #include "example/common/root_certificates.hpp"
 
 #include <boost/beast/core.hpp>
+#include <boost/beast/ssl.hpp>
 #include <boost/beast/websocket.hpp>
 #include <boost/beast/websocket/ssl.hpp>
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <cstdlib>
 #include <functional>
 #include <iostream>

example/websocket/client/coro-ssl/websocket_client_coro_ssl.cpp

@@ -16,9 +16,9 @@
 #include "example/common/root_certificates.hpp"
 
 #include <boost/beast/core.hpp>
+#include <boost/beast/ssl.hpp>
 #include <boost/beast/websocket.hpp>
 #include <boost/beast/websocket/ssl.hpp>
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/spawn.hpp>
 #include <cstdlib>
 #include <functional>

example/websocket/client/sync-ssl/websocket_client_sync_ssl.cpp

@@ -16,9 +16,9 @@
 #include "example/common/root_certificates.hpp"
 
 #include <boost/beast/core.hpp>
+#include <boost/beast/ssl.hpp>
 #include <boost/beast/websocket.hpp>
 #include <boost/beast/websocket/ssl.hpp>
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/connect.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/stream.hpp>

example/websocket/server/async-ssl/websocket_server_async_ssl.cpp

@@ -16,9 +16,9 @@
 #include "example/common/server_certificate.hpp"
 
 #include <boost/beast/core.hpp>
+#include <boost/beast/ssl.hpp>
 #include <boost/beast/websocket.hpp>
 #include <boost/beast/websocket/ssl.hpp>
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/strand.hpp>
 #include <algorithm>
 #include <cstdlib>

example/websocket/server/coro-ssl/websocket_server_coro_ssl.cpp

@@ -16,9 +16,9 @@
 #include "example/common/server_certificate.hpp"
 
 #include <boost/beast/core.hpp>
+#include <boost/beast/ssl.hpp>
 #include <boost/beast/websocket.hpp>
 #include <boost/beast/websocket/ssl.hpp>
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/spawn.hpp>
 #include <algorithm>
 #include <cstdlib>

example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp

@@ -16,9 +16,9 @@
 #include "example/common/server_certificate.hpp"
 
 #include <boost/beast/core.hpp>
+#include <boost/beast/ssl.hpp>
 #include <boost/beast/websocket.hpp>
 #include <boost/beast/websocket/ssl.hpp>
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/coroutine.hpp>
 #include <boost/asio/strand.hpp>
 #include <algorithm>

example/websocket/server/sync-ssl/websocket_server_sync_ssl.cpp

@@ -16,9 +16,9 @@
 #include "example/common/server_certificate.hpp"
 
 #include <boost/beast/core.hpp>
+#include <boost/beast/ssl.hpp>
 #include <boost/beast/websocket.hpp>
 #include <boost/beast/websocket/ssl.hpp>
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/stream.hpp>
 #include <cstdlib>

test/beast/ssl/ssl_stream.cpp

@@ -7,9 +7,5 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
-#if BOOST_BEAST_USE_OPENSSL
-
 // Test that header file is self-contained.
-#include <boost/beast/_experimental/core/ssl_stream.hpp>
-
-#endif
+#include <boost/beast/ssl/ssl_stream.hpp>

test/bench/parser/bench_parser.cpp

@@ -210,7 +210,7 @@ public:
         }
 
         void
-        on_finish_impl(error_code& ec) override
+        on_finish_impl(error_code&) override
         {
         }
     };

test/doc/websocket_snippets.cpp

@@ -291,8 +291,6 @@ class stream;
 
 //------------------------------------------------------------------------------
 
-#if BOOST_BEAST_USE_OPENSSL
-
 //[wss_snippet_1
 #include <boost/beast/websocket/ssl.hpp>
 #include <boost/asio/ssl.hpp>
@@ -335,6 +333,3 @@ net::ip::tcp::socket sock{ioc};
 } // fxx()
 
 } // doc_wss_snippets
-
-#endif
-

test/example/common/root_certificates.cpp

@@ -7,10 +7,5 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
-#if BOOST_BEAST_USE_OPENSSL
-
 // Test that header file is self-contained.
 #include "example/common/root_certificates.hpp"
-
-#endif
-

test/example/common/server_certificate.cpp

@@ -7,9 +7,5 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
-#if BOOST_BEAST_USE_OPENSSL
-
 // Test that header file is self-contained.
 #include "example/common/server_certificate.hpp"
-
-#endif