From f5f72d78975e0f1cebd6e89702e107293d687e7b Mon Sep 17 00:00:00 2001
From: Chunting Gu <chunting.gu@outlook.com>
Date: Fri, 16 Apr 2021 19:18:40 +0800
Subject: [PATCH] fix compile error on windows; fix compile error when ssl is
 off

---
 webcc/client_session.cc | 16 +++++++++++++---
 webcc/socket.cc         | 12 ------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/webcc/client_session.cc b/webcc/client_session.cc
index a8e187c..6967818 100644
--- a/webcc/client_session.cc
+++ b/webcc/client_session.cc
@@ -2,13 +2,23 @@
 
 #include <cassert>
 
+#if WEBCC_ENABLE_SSL
+#if (defined(_WIN32) || defined(_WIN64))
+
+#include <cryptuiapi.h>
+#include <wincrypt.h>
+#include <windows.h>
+
+#include "openssl/x509.h"
+
+#endif  // defined(_WIN32) || defined(_WIN64)
+#endif  // WEBCC_ENABLE_SSL
+
 #include "webcc/base64.h"
 #include "webcc/logger.h"
 #include "webcc/url.h"
 #include "webcc/utility.h"
  
-namespace ssl = boost::asio::ssl;
-
 namespace webcc {
 
 #if WEBCC_ENABLE_SSL
@@ -64,7 +74,7 @@ static bool UseSystemCertificateStore(SSL_CTX* ssl_ctx) {
 ClientSession::ClientSession(bool ssl_verify, std::size_t buffer_size)
     : work_guard_(boost::asio::make_work_guard(io_context_)),
 #if WEBCC_ENABLE_SSL
-      ssl_context_(ssl::context::sslv23),
+      ssl_context_(boost::asio::ssl::context::sslv23),
 #endif
       ssl_verify_(ssl_verify), buffer_size_(buffer_size) {
 #if WEBCC_ENABLE_SSL
diff --git a/webcc/socket.cc b/webcc/socket.cc
index f2c8ae5..f6f0bf4 100644
--- a/webcc/socket.cc
+++ b/webcc/socket.cc
@@ -1,17 +1,5 @@
 #include "webcc/socket.h"
 
-#if WEBCC_ENABLE_SSL
-#if (defined(_WIN32) || defined(_WIN64))
-
-#include <cryptuiapi.h>
-#include <wincrypt.h>
-#include <windows.h>
-
-#include "openssl/x509.h"
-
-#endif  // defined(_WIN32) || defined(_WIN64)
-#endif  // WEBCC_ENABLE_SSL
-
 #include "boost/asio/connect.hpp"
 #include "boost/asio/read.hpp"
 #include "boost/asio/write.hpp"