Merge pull request #1431 from Altinity/fixes/25.3-fips/contribs-amqp

25.3-FIPS: Contribs - Fixed building AMQP contrib

Author: Enmk

contrib/amqpcpp-cmake/CMakeLists.txt

@@ -45,4 +45,10 @@ add_library(_amqp-cpp ${SRCS})
 
 target_include_directories (_amqp-cpp SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/include" "${LIBRARY_DIR}")
 target_link_libraries (_amqp-cpp PUBLIC OpenSSL::Crypto OpenSSL::SSL ch_contrib::uv)
+
+# errno.h should've been explicitly included in sslerrorprinter.cpp, hack to fix it:
+target_compile_options (_amqp-cpp
+    PRIVATE -includeerrno.h
+)
+
 add_library (ch_contrib::amqp_cpp ALIAS _amqp-cpp)

contrib/openssl-cmake/include/evp_API_shim.h

@@ -64,4 +64,9 @@ inline void EVP_CIPHER_free(EVP_CIPHER *cipher)
     (void)(cipher);
 }
 
+// Required for contrib/minizip-ng/mz_crypt_openssl.c mz_crypt_init()
+// since there are no dynamically loaded engines, disabling the flag is Ok:
+// all engines are initialized anyway
+# define OPENSSL_INIT_ENGINE_ALL_BUILTIN 0
+
 #endif

docker/packager/packager

@@ -283,9 +283,13 @@ def parse_env_variables(
 
         # FIPS mode begin
         cmake_flags.append("-DFIPS_CLICKHOUSE=1")
+        # TODO(vnemkov): this is transitional measures, make sure to either enable all libraries or disable some selectively before releasing
         cmake_flags.append("-DENABLE_LIBRARIES=0")
         cmake_flags.append("-DENABLE_NURAFT=1")
         cmake_flags.append("-DENABLE_YAML_CPP=1")
+        cmake_flags.append("-DENABLE_AMQPCPP=1")
+        cmake_flags.append("-DENABLE_MINIZIP=1")
+        cmake_flags.append("-DENABLE_CASSANDRA=1")
         # FIPS mode end
 
         # Reduce linking and building time by avoid *install/all dependencies