Bundle OpenSSL3 modules

Change-Id: Ic6f620d1770bb2426610b25b0da0340e1f3ba713
(cherry picked from commit b09b5a0c1ef7720b6c1d31aef3859441182408a2)

Author: Paweł Andruszkiewicz

CMakeLists.txt

@@ -896,6 +896,33 @@ IF (WITH_SSL_PATH AND (APPLE OR WIN32 OR LINUX_STANDALONE))
     MESSAGE(STATUS "CRYPTO_FULL_NAME ${CRYPTO_FULL_NAME}")
     MESSAGE(STATUS "OPENSSL_FULL_NAME ${OPENSSL_FULL_NAME}")
   ENDIF()
+
+  FIND_PATH(OPENSSL_MODULES_DIR
+    NAMES ossl-modules
+    NO_CMAKE_PATH
+    NO_CMAKE_ENVIRONMENT_PATH
+    HINTS ${WITH_SSL_PATH}
+    PATH_SUFFIXES lib lib64
+  )
+
+  IF(OPENSSL_MODULES_DIR)
+    SET(OPENSSL_MODULES_DIR "${OPENSSL_MODULES_DIR}/ossl-modules")
+    FILE(TO_CMAKE_PATH "${OPENSSL_MODULES_DIR}" OPENSSL_MODULES_DIR)
+    MESSAGE(STATUS "OPENSSL_MODULES_DIR ${OPENSSL_MODULES_DIR}")
+
+    IF(WIN32)
+      SET(_module_ext "dll")
+    ELSEIF(APPLE)
+      SET(_module_ext "dylib")
+    ELSE()
+      SET(_module_ext "so")
+    ENDIF()
+
+    FILE(GLOB OPENSSL_MODULES_LIST "${OPENSSL_MODULES_DIR}/*.${_module_ext}")
+    MESSAGE(STATUS "OPENSSL_MODULES_LIST ${OPENSSL_MODULES_LIST}")
+
+    add_definitions(-DBUNDLE_OPENSSL_MODULES)
+  ENDIF()
 ENDIF()
 
 if (NOT BUILD_SOURCE_PACKAGE)

mysqlshdk/shellcore/shell_init.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023 Oracle and/or its affiliates.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0,
@@ -22,11 +22,16 @@
  */
 
 #include "shellcore/shell_init.h"
+
 #include <curl/curl.h>
 #include <mysql.h>
 #include <stdlib.h>
 #include <stdexcept>
 
+#include "mysqlshdk/libs/utils/utils_file.h"
+#include "mysqlshdk/libs/utils/utils_general.h"
+#include "mysqlshdk/libs/utils/utils_path.h"
+
 #ifdef HAVE_V8
 namespace shcore {
 extern void JScript_context_init();
@@ -36,6 +41,23 @@ extern void JScript_context_fini();
 
 namespace mysqlsh {
 
+namespace {
+
+void init_openssl_modules() {
+#ifdef BUNDLE_OPENSSL_MODULES
+  constexpr auto k_env_var = "OPENSSL_MODULES";
+
+  // don't override path set by the user
+  if (!::getenv(k_env_var)) {
+    shcore::setenv(
+        k_env_var,
+        shcore::path::join_path(shcore::get_library_folder(), "ossl-modules"));
+  }
+#endif
+}
+
+}  // namespace
+
 void thread_init() { mysql_thread_init(); }
 
 void thread_end() { mysql_thread_end(); }
@@ -51,6 +73,7 @@ void global_init() {
 
   srand(time(0));
   curl_global_init(CURL_GLOBAL_ALL);
+  init_openssl_modules();
 }
 
 void global_end() {

packaging/rpm/mysql-shell.spec.in

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2016, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -277,6 +277,8 @@ rm -f %{buildroot}%{_datadir}/mysqlsh/{LICENSE,README}
 %if 0%{?bundled_openssl:1}
 %{_prefix}/lib/mysqlsh/libcrypto*
 %{_prefix}/lib/mysqlsh/libssl*
+# we assume OpenSSL3 is bundled and it has the modules
+%{_prefix}/lib/mysqlsh/ossl-modules/*
 %endif
 %if 0%{?bundled_python:1}
 %{_prefix}/lib/mysqlsh/include/python*

src/CMakeLists.txt

@@ -157,6 +157,20 @@ if(BUNDLED_OPENSSL)
       DESTINATION ${INSTALL_BINDIR}
       COMPONENT main
     )
+
+    IF(OPENSSL_MODULES_DIR)
+      # Copy the OpenSSL modules to the build dir (for running tests in build tree)
+      ADD_CUSTOM_COMMAND(TARGET mysqlsh POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E make_directory "${CONFIG_BINARY_DIR}/${INSTALL_LIBDIR}/ossl-modules"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${OPENSSL_MODULES_LIST}
+                    "${CONFIG_BINARY_DIR}/${INSTALL_LIBDIR}/ossl-modules")
+
+      # Install/bundle the OpenSSL modules
+      INSTALL(PROGRAMS ${OPENSSL_MODULES_LIST}
+        DESTINATION "${INSTALL_LIBDIR}/ossl-modules"
+        COMPONENT main
+      )
+    ENDIF()
   ELSE()
     # Copy the OpenSSL libraries to the build dir (for running tests in build tree)
     ADD_CUSTOM_COMMAND(TARGET mysqlsh POST_BUILD
@@ -204,6 +218,10 @@ if(BUNDLED_OPENSSL)
         COMPONENT main
       )
     ENDIF()
+
+    IF(OPENSSL_MODULES_DIR)
+      install_bundled_binaries(BINARIES ${OPENSSL_MODULES_LIST} DESTINATION "${INSTALL_LIBDIR}/ossl-modules" TARGET mysqlsh)
+    ENDIF()
   ENDIF()
 endif()