Skip to content

25.3-FIPS: Contribs - Fixed building AMQP contrib #1431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Enmk merged 3 commits into from
Feb 22, 2026
Merged

25.3-FIPS: Contribs - Fixed building AMQP contrib #1431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87e46fc
Fixed building AMQP contrib
Enmk Feb 19, 2026
b585fd4
fix contrib/minizip-ng
Enmk Feb 20, 2026
0c0fd41
Enabled more contribs by default
Enmk Feb 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions contrib/amqpcpp-cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
5 changes: 5 additions & 0 deletions contrib/openssl-cmake/include/evp_API_shim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions docker/packager/packager
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading