Skip to content

25.3.8-fips: fixes for verification issues #1616

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

Open
mkmkme wants to merge 3 commits into
base: releases/25.3.8-fips
Choose a base branch
from
+7 −3
Open

25.3.8-fips: fixes for verification issues #1616

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
714e479
shim: fix a memory leak in BIO_do_handshake
mkmkme Apr 3, 2026
76d9efa
CompressionCodecEncrypted: fix the non-fips build
mkmkme Apr 3, 2026
80cbce6
Compression: fix the copy-paste error in fuzzer
mkmkme Apr 3, 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
1 change: 0 additions & 1 deletion 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 @@ -124,7 +124,6 @@ static inline int BIO_do_handshake(BIO *b) {
if (!ssl)
return 0;
if (!SSL_get_rbio(ssl) && BIO_next(b)) {
BIO_up_ref(BIO_next(b));
BIO_up_ref(BIO_next(b));
SSL_set_bio(ssl, BIO_next(b), BIO_next(b));
}
Expand Down
5 changes: 5 additions & 0 deletions src/Compression/CompressionCodecEncrypted.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,12 @@ namespace DB
/// Register codecs for all algorithms
void registerCodecEncrypted(CompressionCodecFactory & factory)
{
#if defined(FIPS_CLICKHOUSE) && FIPS_CLICKHOUSE
registerEncryptionCodec(factory, AES_128_GCM);
registerEncryptionCodec(factory, AES_256_GCM);
#else
registerEncryptionCodec(factory, AES_128_GCM_SIV);
registerEncryptionCodec(factory, AES_256_GCM_SIV);
#endif
}
}
4 changes: 2 additions & 2 deletions src/Compression/fuzzers/encrypted_decompress_fuzzer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)

auto config = generator.getResult();
#if defined(FIPS_CLICKHOUSE) && FIPS_CLICKHOUSE
auto codec_128 = getCompressionCodecEncrypted(DB::AES_128_GCM_SIV);
auto codec_256 = getCompressionCodecEncrypted(DB::AES_256_GCM_SIV);
auto codec_128 = getCompressionCodecEncrypted(DB::AES_128_GCM);
auto codec_256 = getCompressionCodecEncrypted(DB::AES_256_GCM);
#else
auto codec_128 = getCompressionCodecEncrypted(DB::AES_128_GCM_SIV);
auto codec_256 = getCompressionCodecEncrypted(DB::AES_256_GCM_SIV);
Expand Down
Loading