Skip to content

[DO NOT MERGE] 25.3.8-fips: compression: use fips-compliant non-siv version of codec #1450

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 1 commit into
base: releases/25.3.8-fips
Choose a base branch
from
Open

[DO NOT MERGE] 25.3.8-fips: compression: use fips-compliant non-siv version of codec #1450

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/Compression/CompressionCodecEncrypted.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,13 @@ const char * getMethod(EncryptionMethod Method)
/// a different ciphertext / persistence). When ClickHouse migrated to OpenSSL on all platforms, this twist for s390/x needed to be kept,
/// otherwise encrypted data on s390/x can no longer be read.
if (Method == AES_128_GCM_SIV)
#if defined(__s390x__)
#if defined(__s390x__) || defined(OPENSSL_IS_BORINGSSL)
return "AES-128-GCM";
#else
return "AES-128-GCM-SIV";
#endif
else if (Method == AES_256_GCM_SIV)
#if defined(__s390x__)
#if defined(__s390x__) || defined(OPENSSL_IS_BORINGSSL)
return "AES-256-GCM";
#else
return "AES-256-GCM-SIV";
Expand Down
Loading