CXXCBC-733: Fix build with BoringSSL (#839)

Author: avsej

CMakeLists.txt

@@ -466,7 +466,7 @@ if(COUCHBASE_CXX_CLIENT_BUILD_SHARED OR BUILD_SHARED_LIBS)
   set_target_properties(couchbase_cxx_client PROPERTIES VERSION ${couchbase_cxx_client_VERSION_MAJOR}
                                                         SOVERSION ${couchbase_cxx_client_VERSION})
   list(APPEND couchbase_cxx_client_LIBRARIES couchbase_cxx_client)
-  if (NOT WIN32)
+  if(NOT WIN32)
     set(couchbase_cxx_client_DEFAULT_LIBRARY couchbase_cxx_client::couchbase_cxx_client)
   endif()
 endif()
@@ -543,8 +543,8 @@ foreach(TARGET ${couchbase_cxx_client_LIBRARIES})
       endif()
       target_link_libraries(${TARGET} PRIVATE $<BUILD_INTERFACE:ssl> $<BUILD_INTERFACE:crypto>)
       target_include_directories(
-        ${TARGET} SYSTEM PRIVATE $<BUILD_INTERFACE:$<TARGET_PROPERTY:ssl,INTERFACE_INCLUDE_DIRECTORIES>>
-                                 $<BUILD_INTERFACE:$<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>>)
+        ${TARGET} PRIVATE $<BUILD_INTERFACE:$<TARGET_PROPERTY:ssl,INTERFACE_INCLUDE_DIRECTORIES>>
+                          $<BUILD_INTERFACE:$<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>>)
     else()
       if(TARGET PkgConfig::PKG_CONFIG_OPENSSL)
         target_link_libraries(${TARGET} PUBLIC PkgConfig::PKG_CONFIG_OPENSSL)

cmake/OpenSSL.cmake

@@ -54,8 +54,6 @@ elseif(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)
       )
     endif()
   endif()
-  declare_system_library(ssl)
-  declare_system_library(crypto)
   add_library(OpenSSL::SSL ALIAS ssl)
   add_library(OpenSSL::Crypto ALIAS crypto)
 else()
@@ -279,3 +277,17 @@ mozilla_ca_certs_sha256() -> std::string_view
 }
 } // namespace couchbase::core::default_ca
 ")
+
+set(OPENSSL_HEADERS_TO_PROXY
+    crypto.h
+    evp.h
+    hmac.h
+    md5.h
+    rand.h
+    sha.h
+    ssl.h
+    x509.h)
+foreach(HEADER_NAME IN LISTS OPENSSL_HEADERS_TO_PROXY)
+  configure_file("${PROJECT_SOURCE_DIR}/cmake/include_ssl.hxx.in"
+                 "${CMAKE_CURRENT_BINARY_DIR}/generated/include_ssl/${HEADER_NAME}" @ONLY)
+endforeach()

cmake/Testing.cmake

@@ -203,6 +203,8 @@ endmacro()
 
 add_library(test_main OBJECT ${PROJECT_SOURCE_DIR}/test/main.cxx)
 target_link_libraries(test_main PUBLIC Catch2::Catch2 OpenSSL::SSL)
+target_include_directories(test_main PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}/generated
+                                             ${PROJECT_BINARY_DIR}/generated_$<CONFIG>)
 
 if(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL AND WIN32)
   set_target_properties(test_main PROPERTIES LINK_FLAGS "/ignore:4099")

cmake/include_ssl.hxx.in

@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *     Copyright 2020-Present Couchbase, Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+#pragma once
+
+#if defined(COUCHBASE_CXX_CLIENT_STATIC_BORINGSSL)
+
+#include <openssl/is_boringssl.h>
+
+#if defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpragmas"
+#pragma GCC diagnostic ignored "-Wpedantic"
+#pragma GCC diagnostic ignored "-Wuseless-cast"
+#pragma GCC diagnostic ignored "-Wgnu-anonymous-struct"
+#pragma GCC diagnostic ignored "-Wnested-anon-types"
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
+
+#include <openssl/@HEADER_NAME@>
+
+#if defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
+#else
+
+#include <openssl/@HEADER_NAME@>
+
+#endif
+
+

core/crypto/cbcrypto.cc

@@ -589,10 +589,10 @@ decrypt(const couchbase::core::crypto::Cipher cipher,
 
 #else
 
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include <openssl/md5.h>
-#include <openssl/sha.h>
+#include "include_ssl/evp.h"
+#include "include_ssl/hmac.h"
+#include "include_ssl/md5.h"
+#include "include_ssl/sha.h"
 
 // OpenSSL
 

core/impl/crypto.cxx

@@ -23,7 +23,7 @@
 #include "core/mcbp/big_endian.hxx"
 #include "core/utils/binary.hxx"
 
-#include <openssl/rand.h>
+#include "include_ssl/rand.h"
 #include <spdlog/fmt/bundled/format.h>
 
 namespace couchbase::crypto::internal

core/meta/version.cxx

@@ -26,11 +26,11 @@
 #include <couchbase/build_info.hxx>
 #include <couchbase/build_version.hxx>
 
+#include "include_ssl/crypto.h"
+#include "include_ssl/x509.h"
 #include <asio/version.hpp>
 #include <hdr/hdr_histogram_version.h>
 #include <llhttp.h>
-#include <openssl/crypto.h>
-#include <openssl/x509.h>
 #include <snappy-stubs-public.h>
 #include <spdlog/fmt/bundled/core.h>
 #include <spdlog/version.h>

test/main.cxx

@@ -19,7 +19,7 @@
 
 #include <catch2/catch_session.hpp>
 
-#include <openssl/ssl.h>
+#include "include_ssl/ssl.h"
 
 auto
 main(int argc, char* argv[]) -> int

test/test_unit_utils.cxx

@@ -33,7 +33,7 @@
 
 #include <couchbase/error_codes.hxx>
 
-#include <openssl/crypto.h>
+#include "include_ssl/crypto.h"
 #include <tao/json.hpp>
 
 TEST_CASE("unit: transformer to deduplicate JSON keys", "[unit]")