From 6331e03a3a08e76e043f3379a1295be12d1fab58 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Sat, 23 Feb 2019 10:46:43 -0800
Subject: [PATCH] OpenSSL is required for tests and examples

---
 CHANGELOG.md                                              | 1 +
 CMakeLists.txt                                            | 8 --------
 example/advanced/server-flex/advanced_server_flex.cpp     | 2 +-
 example/http/client/async-ssl/http_client_async_ssl.cpp   | 2 +-
 example/http/client/coro-ssl/http_client_coro_ssl.cpp     | 2 +-
 example/http/client/sync-ssl/http_client_sync_ssl.cpp     | 2 +-
 example/http/server/async-ssl/http_server_async_ssl.cpp   | 2 +-
 example/http/server/coro-ssl/http_server_coro_ssl.cpp     | 2 +-
 example/http/server/flex/http_server_flex.cpp             | 2 +-
 .../server/stackless-ssl/http_server_stackless_ssl.cpp    | 2 +-
 example/http/server/sync-ssl/http_server_sync_ssl.cpp     | 2 +-
 .../client/async-ssl/websocket_client_async_ssl.cpp       | 2 +-
 .../client/coro-ssl/websocket_client_coro_ssl.cpp         | 2 +-
 .../client/sync-ssl/websocket_client_sync_ssl.cpp         | 2 +-
 .../server/async-ssl/websocket_server_async_ssl.cpp       | 2 +-
 .../server/coro-ssl/websocket_server_coro_ssl.cpp         | 2 +-
 .../stackless-ssl/websocket_server_stackless_ssl.cpp      | 2 +-
 .../server/sync-ssl/websocket_server_sync_ssl.cpp         | 2 +-
 test/beast/ssl/ssl_stream.cpp                             | 6 +-----
 test/bench/parser/bench_parser.cpp                        | 2 +-
 test/doc/websocket_snippets.cpp                           | 5 -----
 test/example/common/root_certificates.cpp                 | 5 -----
 test/example/common/server_certificate.cpp                | 4 ----
 23 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32db9d66..550dd054 100644
--- a/CHANGELOG.md
+++ b/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
 
 --------------------------------------------------------------------------------
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37226b09..60308ff3 100644
--- a/CMakeLists.txt
+++ b/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()
-
 #
 #-------------------------------------------------------------------------------
 
diff --git a/example/advanced/server-flex/advanced_server_flex.cpp b/example/advanced/server-flex/advanced_server_flex.cpp
index 72d971de..6dede98c 100644
--- a/example/advanced/server-flex/advanced_server_flex.cpp
+++ b/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>
diff --git a/example/http/client/async-ssl/http_client_async_ssl.cpp b/example/http/client/async-ssl/http_client_async_ssl.cpp
index c922e4d8..345acab0 100644
--- a/example/http/client/async-ssl/http_client_async_ssl.cpp
+++ b/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>
diff --git a/example/http/client/coro-ssl/http_client_coro_ssl.cpp b/example/http/client/coro-ssl/http_client_coro_ssl.cpp
index 53ef2b9d..d2a16d2b 100644
--- a/example/http/client/coro-ssl/http_client_coro_ssl.cpp
+++ b/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>
diff --git a/example/http/client/sync-ssl/http_client_sync_ssl.cpp b/example/http/client/sync-ssl/http_client_sync_ssl.cpp
index 26ad1ac1..c38208fc 100644
--- a/example/http/client/sync-ssl/http_client_sync_ssl.cpp
+++ b/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>
diff --git a/example/http/server/async-ssl/http_server_async_ssl.cpp b/example/http/server/async-ssl/http_server_async_ssl.cpp
index f8316bff..9908a8f2 100644
--- a/example/http/server/async-ssl/http_server_async_ssl.cpp
+++ b/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>
diff --git a/example/http/server/coro-ssl/http_server_coro_ssl.cpp b/example/http/server/coro-ssl/http_server_coro_ssl.cpp
index 90c2f20c..5d515aad 100644
--- a/example/http/server/coro-ssl/http_server_coro_ssl.cpp
+++ b/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>
diff --git a/example/http/server/flex/http_server_flex.cpp b/example/http/server/flex/http_server_flex.cpp
index b9a982b5..c16637c6 100644
--- a/example/http/server/flex/http_server_flex.cpp
+++ b/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>
diff --git a/example/http/server/stackless-ssl/http_server_stackless_ssl.cpp b/example/http/server/stackless-ssl/http_server_stackless_ssl.cpp
index e986469b..bc12df44 100644
--- a/example/http/server/stackless-ssl/http_server_stackless_ssl.cpp
+++ b/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>
diff --git a/example/http/server/sync-ssl/http_server_sync_ssl.cpp b/example/http/server/sync-ssl/http_server_sync_ssl.cpp
index 6d9a2ddb..113f0374 100644
--- a/example/http/server/sync-ssl/http_server_sync_ssl.cpp
+++ b/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>
diff --git a/example/websocket/client/async-ssl/websocket_client_async_ssl.cpp b/example/websocket/client/async-ssl/websocket_client_async_ssl.cpp
index 6a22d69e..f66b0ba5 100644
--- a/example/websocket/client/async-ssl/websocket_client_async_ssl.cpp
+++ b/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>
diff --git a/example/websocket/client/coro-ssl/websocket_client_coro_ssl.cpp b/example/websocket/client/coro-ssl/websocket_client_coro_ssl.cpp
index a064c5d8..8d4b06af 100644
--- a/example/websocket/client/coro-ssl/websocket_client_coro_ssl.cpp
+++ b/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>
diff --git a/example/websocket/client/sync-ssl/websocket_client_sync_ssl.cpp b/example/websocket/client/sync-ssl/websocket_client_sync_ssl.cpp
index 1e222802..25cdff8e 100644
--- a/example/websocket/client/sync-ssl/websocket_client_sync_ssl.cpp
+++ b/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>
diff --git a/example/websocket/server/async-ssl/websocket_server_async_ssl.cpp b/example/websocket/server/async-ssl/websocket_server_async_ssl.cpp
index 5d3c250d..56cb4201 100644
--- a/example/websocket/server/async-ssl/websocket_server_async_ssl.cpp
+++ b/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>
diff --git a/example/websocket/server/coro-ssl/websocket_server_coro_ssl.cpp b/example/websocket/server/coro-ssl/websocket_server_coro_ssl.cpp
index 7d305c8a..2a4c3d18 100644
--- a/example/websocket/server/coro-ssl/websocket_server_coro_ssl.cpp
+++ b/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>
diff --git a/example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp b/example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp
index 52a50574..f041c732 100644
--- a/example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp
+++ b/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>
diff --git a/example/websocket/server/sync-ssl/websocket_server_sync_ssl.cpp b/example/websocket/server/sync-ssl/websocket_server_sync_ssl.cpp
index f00eb7a1..dc11a5f4 100644
--- a/example/websocket/server/sync-ssl/websocket_server_sync_ssl.cpp
+++ b/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>
diff --git a/test/beast/ssl/ssl_stream.cpp b/test/beast/ssl/ssl_stream.cpp
index 6ac4745c..da571703 100644
--- a/test/beast/ssl/ssl_stream.cpp
+++ b/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>
diff --git a/test/bench/parser/bench_parser.cpp b/test/bench/parser/bench_parser.cpp
index d8b2cdac..a6d67f77 100644
--- a/test/bench/parser/bench_parser.cpp
+++ b/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
         {
         }
     };
diff --git a/test/doc/websocket_snippets.cpp b/test/doc/websocket_snippets.cpp
index 40c24cbd..8d308c04 100644
--- a/test/doc/websocket_snippets.cpp
+++ b/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
-
diff --git a/test/example/common/root_certificates.cpp b/test/example/common/root_certificates.cpp
index 044dfa90..780d5ed6 100644
--- a/test/example/common/root_certificates.cpp
+++ b/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
-
diff --git a/test/example/common/server_certificate.cpp b/test/example/common/server_certificate.cpp
index 9cc44a44..ffb34933 100644
--- a/test/example/common/server_certificate.cpp
+++ b/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