8000 Fix build when cassert is not set by AndersAstrand · Pull Request #341 · percona/postgres · GitHub
[go: up one dir, main page]
Skip to content

Fix build when cassert is not set #341

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
merged 2 commits into from
May 19, 2025
Merged

Fix build when cassert is not set #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10bd52c
Remove assertion from AesInit
AndersAstrand May 15, 2025
7b25902
Remove unused result from kmipSslConnect
AndersAstrand May 15, 2025
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: 0 additions & 6 deletions contrib/pg_tde/src/encryption/enc_aes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,12 @@ static const EVP_CIPHER *cipher_ctr_ecb = NULL;
void
AesInit(void)
{
static bool initialized = false;

Assert(!initialized);

OpenSSL_add_all_algorithms();
ERR_load_crypto_strings();

cipher_cbc = EVP_aes_128_cbc();
cipher_gcm = EVP_aes_128_gcm();
cipher_ctr_ecb = EVP_aes_128_ecb();

initialized = true;
}

static void
Expand Down
4 changes: 1 addition & 3 deletions contrib/pg_tde/src/keyring/keyring_kmip.c
7DF9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,9 @@ set_key_by_name(GenericKeyring *keyring, KeyInfo *key)
{
KmipCtx ctx;
KmipKeyring *kmip_keyring = (KmipKeyring *) keyring;
bool sslresult;
int result;

sslresult = kmipSslConnect(&ctx, kmip_keyring, true);
Assert(sslresult);
kmipSslConnect(&ctx, kmip_keyring, true);

result = pg_tde_kmip_set_by_name(ctx.bio, key->name, key->data.data, key->data.len);

Expand Down
0