From 2da2bf5105be2f90975c000d8e8b62203c165741 Mon Sep 17 00:00:00 2001 From: Andreas Karlsson Date: Sat, 24 May 2025 13:28:25 +0200 Subject: [PATCH] Fix typo in names of IV and tag length defines --- contrib/pg_tde/src/access/pg_tde_tdemap.c | 4 ++-- contrib/pg_tde/src/include/access/pg_tde_tdemap.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/pg_tde/src/access/pg_tde_tdemap.c b/contrib/pg_tde/src/access/pg_tde_tdemap.c index f5c8fb23552..239ebb45b71 100644 --- a/contrib/pg_tde/src/access/pg_tde_tdemap.c +++ b/contrib/pg_tde/src/access/pg_tde_tdemap.c @@ -389,7 +389,7 @@ pg_tde_sign_principal_key_info(TDESignedPrincipalKeyInfo *signed_key_info, const { signed_key_info->data = principal_key->keyInfo; - if (!RAND_bytes(signed_key_info->sign_iv, MAP_ENTRY_EMPTY_IV_SIZE)) + if (!RAND_bytes(signed_key_info->sign_iv, MAP_ENTRY_IV_SIZE)) ereport(ERROR, errcode(ERRCODE_INTERNAL_ERROR), errmsg("could not generate iv for key map: %s", ERR_error_string(ERR_get_error(), NULL))); @@ -405,7 +405,7 @@ pg_tde_initialize_map_entry(TDEMapEntry *map_entry, const TDEPrincipalKey *princ map_entry->flags = rel_key_data->type; map_entry->enc_key = *rel_key_data; - if (!RAND_bytes(map_entry->entry_iv, MAP_ENTRY_EMPTY_IV_SIZE)) + if (!RAND_bytes(map_entry->entry_iv, MAP_ENTRY_IV_SIZE)) ereport(ERROR, errcode(ERRCODE_INTERNAL_ERROR), errmsg("could not generate iv for key map: %s", ERR_error_string(ERR_get_error(), NULL))); diff --git a/contrib/pg_tde/src/include/access/pg_tde_tdemap.h b/contrib/pg_tde/src/include/access/pg_tde_tdemap.h index 7d2de5b4879..a12ea3699fd 100644 --- a/contrib/pg_tde/src/include/access/pg_tde_tdemap.h +++ b/contrib/pg_tde/src/include/access/pg_tde_tdemap.h @@ -38,8 +38,8 @@ typedef struct InternalKey (((key)->type & TDE_KEY_TYPE_WAL_UNENCRYPTED) != 0 || \ ((key)->type & TDE_KEY_TYPE_WAL_ENCRYPTED) != 0) -#define MAP_ENTRY_EMPTY_IV_SIZE 16 -#define MAP_ENTRY_EMPTY_AEAD_TAG_SIZE 16 +#define MAP_ENTRY_IV_SIZE 16 +#define MAP_ENTRY_AEAD_TAG_SIZE 16 typedef struct { @@ -56,8 +56,8 @@ typedef struct TDEMapEntry uint32 flags; InternalKey enc_key; /* IV and tag used when encrypting the key itself */ - unsigned char entry_iv[MAP_ENTRY_EMPTY_IV_SIZE]; - unsigned char aead_tag[MAP_ENTRY_EMPTY_AEAD_TAG_SIZE]; + unsigned char entry_iv[MAP_ENTRY_IV_SIZE]; + unsigned char aead_tag[MAP_ENTRY_AEAD_TAG_SIZE]; } TDEMapEntry; typedef struct XLogRelKey