impl(common+storage): remove OpenSSL dependency on Windows

.gitignore

@@ -31,3 +31,6 @@ cmake-build-*/
 # `google-cloud-cpp` developers use this file to configure the development
 # workflow build.
 .cloudcxxrc
+
+# Ignore the file with user-defined CMake presets
+CMakeUserPresets.json

ci/cloudbuild/builds/cmake-install.sh

@@ -94,6 +94,7 @@ expected_dirs+=(
   ./include/google/cloud/gkehub/v1/multiclusteringress
   ./include/google/cloud/grpc_utils
   ./include/google/cloud/internal
+  ./include/google/cloud/internal/win32
   # no RPC services in google/cloud/metastore/logging
   ./include/google/cloud/metastore/logging
   ./include/google/cloud/metastore/logging/v1

cmake/AddPkgConfig.cmake

@@ -42,7 +42,7 @@ endmacro ()
 # * ARGN: the names of any pkgconfig modules the generated module depends on
 #
 function (google_cloud_cpp_add_pkgconfig library name description)
-    cmake_parse_arguments(_opt "WITH_SHORT_TARGET" "" "" ${ARGN})
+    cmake_parse_arguments(_opt "WITH_SHORT_TARGET" "" "LIBS;WIN32_LIBS;NON_WIN32_LIBS;WIN32_REQUIRES;NON_WIN32_REQUIRES" ${ARGN})
     if (_opt_WITH_SHORT_TARGET)
         set(target "${library}")
     else ()
@@ -60,6 +60,17 @@ function (google_cloud_cpp_add_pkgconfig library name description)
     else ()
         set(GOOGLE_CLOUD_CPP_PC_LIBS "-lgoogle_cloud_cpp_${library}")
     endif ()
+    list(TRANSFORM _opt_LIBS PREPEND "-l" OUTPUT_VARIABLE _opt_LIBS)
+    string(JOIN " " GOOGLE_CLOUD_CPP_PC_LIBS "${GOOGLE_CLOUD_CPP_PC_LIBS}" ${_opt_LIBS})
+    if (WIN32)
+        list(TRANSFORM _opt_WIN32_LIBS PREPEND "-l" OUTPUT_VARIABLE _opt_WIN32_LIBS)
+        string(JOIN " " GOOGLE_CLOUD_CPP_PC_LIBS "${GOOGLE_CLOUD_CPP_PC_LIBS}" ${_opt_WIN32_LIBS})
+        string(JOIN " " GOOGLE_CLOUD_CPP_PC_REQUIRES "${GOOGLE_CLOUD_CPP_PC_REQUIRES}" ${_opt_WIN32_REQUIRES})
+    else ()
+        list(TRANSFORM _opt_NON_WIN32_LIBS PREPEND "-l" OUTPUT_VARIABLE _opt_NON_WIN32_LIBS)
+        string(JOIN " " GOOGLE_CLOUD_CPP_PC_LIBS "${GOOGLE_CLOUD_CPP_PC_LIBS}" ${_opt_NON_WIN32_LIBS})
+        string(JOIN " " GOOGLE_CLOUD_CPP_PC_REQUIRES "${GOOGLE_CLOUD_CPP_PC_REQUIRES}" ${_opt_NON_WIN32_REQUIRES})
+    endif ()
     get_target_property(target_defs ${target} INTERFACE_COMPILE_DEFINITIONS)
     if (target_defs)
         foreach (def ${target_defs})

google/cloud/BUILD.bazel

@@ -76,6 +76,19 @@ cc_library(
         ],
         "//conditions:default": [],
     }),
+    linkopts = select({
+        "@platforms//os:windows": [
+            "-DEFAULTLIB:bcrypt.lib",
+        ],
+        "//conditions:default": [],
+    }),
+    local_defines = select({
+        "@platforms//os:windows": [
+            "WIN32_LEAN_AND_MEAN",
+            "_WIN32_WINNT=0x0A00",
+        ],
+        "//conditions:default": [],
+    }),
     target_compatible_with = select(
         {
             ":enable_opentelemetry_valid": [],
@@ -99,7 +112,6 @@ to your build command, or set this value in your `.bazelrc` file(s).
         "//:__pkg__",
     ],
     deps = [
-        "@boringssl//:crypto",
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/functional:function_ref",
         "@com_google_absl//absl/strings",
@@ -113,6 +125,11 @@ to your build command, or set this value in your `.bazelrc` file(s).
             "@io_opentelemetry_cpp//api",
         ],
         "//conditions:default": [],
+    }) + select({
+        "@platforms//os:windows": [],
+        "//conditions:default": [
+            "@boringssl//:crypto",
+        ],
     }),
 )
 
@@ -265,24 +282,34 @@ cc_library(
     name = "google_cloud_cpp_rest_internal",
     srcs = google_cloud_cpp_rest_internal_srcs,
     hdrs = google_cloud_cpp_rest_internal_hdrs,
-    # These are needed to use the BoringSSL libraries, and should be set in
-    # any downstream dependency too.
-    defines = select({
+    linkopts = select({
+        "@platforms//os:windows": [
+            "-DEFAULTLIB:bcrypt.lib",
+            "-DEFAULTLIB:crypt32.lib",
+        ],
+        "//conditions:default": [],
+    }),
+    local_defines = select({
         "@platforms//os:windows": [
             "WIN32_LEAN_AND_MEAN",
+            "_WIN32_WINNT=0x0A00",
         ],
         "//conditions:default": [],
     }),
     visibility = ["//:__subpackages__"],
     deps = [
         ":google_cloud_cpp_common",
-        "@boringssl//:crypto",
-        "@boringssl//:ssl",
         "@com_github_curl_curl//:curl",
         "@com_github_nlohmann_json//:nlohmann_json",
         "@com_google_absl//absl/functional:function_ref",
         "@com_google_absl//absl/types:span",
-    ],
+    ] + select({
+        "@platforms//os:windows": [],
+        "//conditions:default": [
+            "@boringssl//:crypto",
+            "@boringssl//:ssl",
+        ],
+    }),
 )
 
 [cc_test(

google/cloud/config-rest.cmake.in

@@ -17,6 +17,8 @@ find_dependency(google_cloud_cpp_common)
 find_dependency(absl)
 find_dependency(CURL)
 find_dependency(nlohmann_json)
-find_dependency(OpenSSL)
+if (NOT WIN32)
+    find_dependency(OpenSSL)
+endif ()
 
 include("${CMAKE_CURRENT_LIST_DIR}/google_cloud_cpp_rest_internal-targets.cmake")

google/cloud/google_cloud_cpp_common.cmake

@@ -14,7 +14,9 @@
 # limitations under the License.
 # ~~~
 
-find_package(OpenSSL REQUIRED)
+if (NOT WIN32)
+    find_package(OpenSSL REQUIRED)
+endif ()
 
 # Generate the version information from the CMake values.
 configure_file(internal/version_info.h.in
@@ -179,8 +181,13 @@ target_link_libraries(
            absl::str_format
            absl::time
            absl::variant
-           Threads::Threads
-           OpenSSL::Crypto)
+           Threads::Threads)
+if (WIN32)
+    target_compile_definitions(google_cloud_cpp_common PRIVATE WIN32_LEAN_AND_MEAN _WIN32_WINNT=0x0A00)
+    target_link_libraries(google_cloud_cpp_common PUBLIC bcrypt)
+else ()
+    target_link_libraries(google_cloud_cpp_common PUBLIC OpenSSL::Crypto)
+endif ()
 
 if (opentelemetry IN_LIST GOOGLE_CLOUD_CPP_ENABLE)
     find_package(opentelemetry-cpp CONFIG)
@@ -249,8 +256,9 @@ google_cloud_cpp_add_pkgconfig(
     "absl_time"
     "absl_time_zone"
     "absl_variant"
-    "openssl"
-    "${GOOGLE_CLOUD_CPP_OPENTELEMETRY_API}")
+    "${GOOGLE_CLOUD_CPP_OPENTELEMETRY_API}"
+    NON_WIN32_REQUIRES openssl
+    WIN32_LIBS bcrypt)
 
 # Create and install the CMake configuration files.
 configure_file("config.cmake.in" "google_cloud_cpp_common-config.cmake" @ONLY)

google/cloud/google_cloud_cpp_rest_internal.bzl

@@ -54,7 +54,7 @@ google_cloud_cpp_rest_internal_hdrs = [
     "internal/oauth2_refreshing_credentials_wrapper.h",
     "internal/oauth2_service_account_credentials.h",
     "internal/oauth2_universe_domain.h",
-    "internal/openssl_util.h",
+    "internal/parse_service_account_p12_file.h",
     "internal/populate_rest_options.h",
     "internal/rest_carrier.h",
     "internal/rest_client.h",
@@ -65,10 +65,12 @@ google_cloud_cpp_rest_internal_hdrs = [
     "internal/rest_request.h",
     "internal/rest_response.h",
     "internal/rest_retry_loop.h",
+    "internal/sign_using_sha256.h",
     "internal/tracing_http_payload.h",
     "internal/tracing_rest_client.h",
     "internal/tracing_rest_response.h",
     "internal/unified_rest_credentials.h",
+    "internal/win32/win32_helpers.h",
     "rest_options.h",
 ]
 
@@ -105,7 +107,8 @@ google_cloud_cpp_rest_internal_srcs = [
     "internal/oauth2_refreshing_credentials_wrapper.cc",
     "internal/oauth2_service_account_credentials.cc",
     "internal/oauth2_universe_domain.cc",
-    "internal/openssl_util.cc",
+    "internal/openssl/parse_service_account_p12_file.cc",
+    "internal/openssl/sign_using_sha256.cc",
     "internal/populate_rest_options.cc",
     "internal/rest_carrier.cc",
     "internal/rest_context.cc",
@@ -117,4 +120,7 @@ google_cloud_cpp_rest_internal_srcs = [
     "internal/tracing_rest_client.cc",
     "internal/tracing_rest_response.cc",
     "internal/unified_rest_credentials.cc",
+    "internal/win32/parse_service_account_p12_file.cc",
+    "internal/win32/sign_using_sha256.cc",
+    "internal/win32/win32_helpers.cc",
 ]

google/cloud/google_cloud_cpp_rest_internal.cmake

@@ -16,7 +16,9 @@
 
 include(IncludeNlohmannJson)
 find_package(CURL REQUIRED)
-find_package(OpenSSL REQUIRED)
+if (NOT WIN32)
+    find_package(OpenSSL REQUIRED)
+endif ()
 
 # the library
 add_library(
@@ -90,8 +92,9 @@ add_library(
     internal/oauth2_service_account_credentials.h
     internal/oauth2_universe_domain.cc
     internal/oauth2_universe_domain.h
-    internal/openssl_util.cc
-    internal/openssl_util.h
+    internal/openssl/parse_service_account_p12_file.cc
+    internal/openssl/sign_using_sha256.cc
+    internal/parse_service_account_p12_file.h
     internal/populate_rest_options.cc
     internal/populate_rest_options.h
     internal/rest_carrier.cc
@@ -109,6 +112,7 @@ add_library(
     internal/rest_response.cc
     internal/rest_response.h
     internal/rest_retry_loop.h
+    internal/sign_using_sha256.h
     internal/tracing_http_payload.cc
     internal/tracing_http_payload.h
     internal/tracing_rest_client.cc
@@ -117,15 +121,22 @@ add_library(
     internal/tracing_rest_response.h
     internal/unified_rest_credentials.cc
     internal/unified_rest_credentials.h
+    internal/win32/parse_service_account_p12_file.cc
+    internal/win32/sign_using_sha256.cc
+    internal/win32/win32_helpers.cc
+    internal/win32/win32_helpers.h
     rest_options.h)
 target_link_libraries(
     google_cloud_cpp_rest_internal
     PUBLIC absl::span google-cloud-cpp::common CURL::libcurl
-           nlohmann_json::nlohmann_json OpenSSL::SSL OpenSSL::Crypto)
+           nlohmann_json::nlohmann_json)
 if (WIN32)
+    target_compile_definitions(google_cloud_cpp_rest_internal PRIVATE WIN32_LEAN_AND_MEAN _WIN32_WINNT=0x0A00)
     # We use `setsockopt()` directly, which requires the ws2_32 (Winsock2 for
     # Windows32?) library on Windows.
-    target_link_libraries(google_cloud_cpp_rest_internal PUBLIC ws2_32)
+    target_link_libraries(google_cloud_cpp_rest_internal PUBLIC ws2_32 bcrypt crypt32)
+else ()
+    target_link_libraries(google_cloud_cpp_rest_internal PUBLIC OpenSSL::SSL OpenSSL::Crypto)
 endif ()
 google_cloud_cpp_add_common_options(google_cloud_cpp_rest_internal)
 target_include_directories(
@@ -167,7 +178,10 @@ google_cloud_cpp_install_headers(google_cloud_cpp_rest_internal
 google_cloud_cpp_add_pkgconfig(
     rest_internal "REST library for the Google Cloud C++ Client Library"
     "Provides REST Transport for the Google Cloud C++ Client Library."
-    "google_cloud_cpp_common" "libcurl" "openssl")
+    "google_cloud_cpp_common"
+    "libcurl"
+    NON_WIN32_REQUIRES openssl
+    WIN32_LIBS ws2_32 bcrypt crypt32)
 
 # Create and install the CMake configuration files.
 include(CMakePackageConfigHelpers)

google/cloud/internal/curl_wrappers.cc

@@ -20,8 +20,10 @@
 #include "google/cloud/log.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_split.h"
+#ifndef _WIN32
 #include <openssl/crypto.h>
 #include <openssl/opensslv.h>
+#endif
 #include <algorithm>
 #include <cctype>
 #include <csignal>
@@ -40,6 +42,9 @@ namespace {
 // LibreSSL calls itself OpenSSL > 2.0, but it really is based on SSL 1.0.2
 // and requires locks.
 #define GOOGLE_CLOUD_CPP_SSL_REQUIRES_LOCKS 1
+#elif defined(_WIN32)
+// We don't use OpenSSL on Windows.
+#define GOOGLE_CLOUD_CPP_SSL_REQUIRES_LOCKS 0
 #elif OPENSSL_VERSION_NUMBER < 0x10100000L  // Older than version 1.1.0
 // Before 1.1.0 OpenSSL requires locks to be used by multiple threads.
 #define GOOGLE_CLOUD_CPP_SSL_REQUIRES_LOCKS 1

google/cloud/internal/curl_wrappers_locking_already_present_test.cc

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef _WIN32
 #include "google/cloud/internal/curl_options.h"
 #include "google/cloud/internal/curl_wrappers.h"
 #include <gmock/gmock.h>
@@ -42,3 +43,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace rest_internal
 }  // namespace cloud
 }  // namespace google
+#endif  // _WIN32

google/cloud/internal/make_jwt_assertion.cc

@@ -14,7 +14,7 @@
 
 #include "google/cloud/internal/make_jwt_assertion.h"
 #include "google/cloud/internal/base64_transforms.h"
-#include "google/cloud/internal/openssl_util.h"
+#include "google/cloud/internal/sign_using_sha256.h"
 
 namespace google {
 namespace cloud {

google/cloud/internal/oauth2_google_credentials.cc

@@ -22,6 +22,7 @@
 #include "google/cloud/internal/oauth2_google_application_default_credentials_file.h"
 #include "google/cloud/internal/oauth2_http_client_factory.h"
 #include "google/cloud/internal/oauth2_service_account_credentials.h"
+#include "google/cloud/internal/parse_service_account_p12_file.h"
 #include "google/cloud/internal/throw_delegate.h"
 #include <nlohmann/json.hpp>
 #include <fstream>