Always require OpenSSL (#1548)

OpenSSL is now required, and should be always present,
hence OLP_SDK_NETWORK_HAS_OPENSSL could be removed

Relates-To: HERESUP-1440

Signed-off-by: Andrey Kashcheev <ext-andrey.kashcheev@here.com>

Author: andrey-kashcheev

olp-cpp-sdk-core/cmake/curl.cmake

@@ -33,20 +33,13 @@ if(CURL_FOUND AND NOT NETWORK_NO_CURL)
     endif()
 
     if(NOT OPENSSL_FOUND)
-        if(ANDROID AND OLP_SDK_ENABLE_ANDROID_CURL)
-            find_package(OpenSSL REQUIRED)
-        else()
-            find_package(OpenSSL)
-        endif()
+        # Enforcing OpenSSL to make sure that it is available
+        find_package(OpenSSL REQUIRED)
     endif()
 
-    if(OPENSSL_FOUND)
-        add_definitions(-DOLP_SDK_NETWORK_HAS_OPENSSL)
-
-        if(ANDROID AND OLP_SDK_ENABLE_ANDROID_CURL)
-            include_directories(${OPENSSL_INCLUDE_DIR})
-            set(OLP_SDK_NETWORK_CURL_LIBRARIES ${OLP_SDK_NETWORK_CURL_LIBRARIES} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
-        endif()
+    if(OPENSSL_FOUND AND ANDROID AND OLP_SDK_ENABLE_ANDROID_CURL)
+        include_directories(${OPENSSL_INCLUDE_DIR})
+        set(OLP_SDK_NETWORK_CURL_LIBRARIES ${OLP_SDK_NETWORK_CURL_LIBRARIES} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
     endif()
 
     option(OLP_SDK_ENABLE_CURL_VERBOSE "Enable support for CURL_VERBOSE environment variable to set libcurl to verbose mode" OFF)

olp-cpp-sdk-core/src/http/curl/NetworkCurl.cpp

@@ -38,7 +38,7 @@
 #include <openssl/x509_vfy.h>
 #include <sys/stat.h>
 #include <cstdio>
-#elif OLP_SDK_NETWORK_HAS_OPENSSL
+#else
 #include "olp/core/utils/Dir.h"
 #endif
 
@@ -112,19 +112,14 @@ int Md5LookupGetBySubject(X509_LOOKUP* ctx, X509_LOOKUP_TYPE type,
 }
 #endif
 
-#elif OLP_SDK_NETWORK_HAS_OPENSSL
+#else
 const auto kCurlCaBundleName = "ca-bundle.crt";
 
 std::string DefaultCaBundlePath() { return kCurlCaBundleName; }
 
-std::string AlternativeCaBundlePath() { return kCurlCaBundleName; }
-
 std::string CaBundlePath() {
   std::string bundle_path;
   bundle_path = DefaultCaBundlePath();
-  if (!olp::utils::Dir::FileExists(bundle_path)) {
-    bundle_path = AlternativeCaBundlePath();
-  }
   if (!olp::utils::Dir::FileExists(bundle_path)) {
     bundle_path.clear();
   }
@@ -258,7 +253,7 @@ CURLcode SetCaBundlePaths(CURL* handle) {
   //  (probably all of them) since OpenSSL still will be trying to find
   //  certificate with SHA1 lookup
   return curl_easy_setopt(handle, CURLOPT_CAPATH, kCurlAndroidCaBundleFolder);
-#elif OLP_SDK_NETWORK_HAS_OPENSSL
+#else
   const auto curl_ca_bundle = CaBundlePath();
   if (!curl_ca_bundle.empty()) {
     return curl_easy_setopt(handle, CURLOPT_CAINFO, curl_ca_bundle.c_str());
@@ -321,10 +316,11 @@ NetworkCurl::NetworkCurl(NetworkInitializationSettings settings)
       LIBCURL_VERSION);
 #endif
 
+  const auto* version_data = curl_version_info(CURLVERSION_NOW);
+
   std::string curl_ca_info;
   std::string curl_ca_path;
 #if CURL_AT_LEAST_VERSION(7, 70, 0)
-  const auto* version_data = curl_version_info(CURLVERSION_NOW);
   curl_ca_path = version_data->capath ? version_data->capath : "<empty>";
   curl_ca_info = version_data->cainfo ? version_data->cainfo : "<empty>";
 #else
@@ -335,7 +331,7 @@ NetworkCurl::NetworkCurl(NetworkInitializationSettings settings)
   std::string ca_bundle_path;
 #if defined(OLP_SDK_ENABLE_ANDROID_CURL) && !defined(ANDROID_HOST)
   ca_bundle_path = kCurlAndroidCaBundleFolder;
-#elif OLP_SDK_NETWORK_HAS_OPENSSL
+#else
   ca_bundle_path = CaBundlePath();
   if (ca_bundle_path.empty()) {
     ca_bundle_path = "<empty>";
@@ -347,6 +343,10 @@ NetworkCurl::NetworkCurl(NetworkInitializationSettings settings)
                      "ca_bundle_path=%s",
                      curl_ca_path.c_str(), curl_ca_info.c_str(),
                      ca_bundle_path.c_str());
+
+  OLP_SDK_LOG_INFO_F(
+      kLogTag, "TLS backend: %s",
+      version_data->ssl_version ? version_data->ssl_version : "<empty>");
 }
 
 NetworkCurl::~NetworkCurl() {

olp-cpp-sdk-core/src/http/curl/NetworkCurl.h

@@ -34,7 +34,6 @@
 #include <boost/optional.hpp>
 
 #if defined(OLP_SDK_ENABLE_ANDROID_CURL) && !defined(ANDROID_HOST)
-#ifdef OLP_SDK_NETWORK_HAS_OPENSSL
 #include <openssl/ossl_typ.h>
 
 #ifdef OPENSSL_NO_MD5
@@ -47,7 +46,6 @@
 // lookup method that uses MD5. Old SHA1 lookup will be left as is.
 #define OLP_SDK_USE_MD5_CERT_LOOKUP
 #endif
-#endif
 
 // CURLOPT_CAINFO_BLOB has become available only in curl-7.77
 // cf. https://curl.se/libcurl/c/CURLOPT_CAINFO_BLOB.html,
@@ -387,12 +385,6 @@ class NetworkCurl : public olp::http::Network,
   /// UNIX Pipe used to notify sleeping worker thread during select() call.
   int pipe_[2]{};
 
-#ifdef OLP_SDK_NETWORK_HAS_OPENSSL
-  /// Mutexes that are used by OpenSSL to synchronize during concurrent
-  /// network transfer.
-  std::unique_ptr<std::mutex[]> ssl_mutexes_{};
-#endif
-
   /// Stores value if `curl_global_init()` was successful on construction.
   bool curl_initialized_;
 

scripts/linux/nv/cppcheck_and_upload_sonar.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (C) 2019-2021 HERE Europe B.V.
+# Copyright (C) 2019-2024 HERE Europe B.V.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -36,7 +36,6 @@ cppcheck \
     -DHAVE_SIGNAL_H \
     -DIGNORE_SIGPIPE \
     -DOLP_SDK_NETWORK_HAS_CURL \
-    -DOLP_SDK_NETWORK_HAS_OPENSSL \
     -DOLP_SDK_NETWORK_HAS_PIPE=1 \
     -DOLP_SDK_NETWORK_HAS_UNISTD_H=1 \
     -DOLP_SDK_PLATFORM_NAME=\"Linux\" \