From b8338686eff63e393373e0686b179b9ffcc22c86 Mon Sep 17 00:00:00 2001
From: Andreas Karlsson <andreas.karlsson@percona.com>
Date: Mon, 5 May 2025 13:10:28 +0200
Subject: [PATCH] Move AesInit() call to _PG_init()

Also clean up the order of the function slightly.
---
 contrib/pg_tde/src/pg_tde.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/contrib/pg_tde/src/pg_tde.c b/contrib/pg_tde/src/pg_tde.c
index ffc90e7d49e..92cf0d9892d 100644
--- a/contrib/pg_tde/src/pg_tde.c
+++ b/contrib/pg_tde/src/pg_tde.c
@@ -73,8 +73,6 @@ tde_shmem_startup(void)
 		prev_shmem_startup_hook();
 
 	TdeShmemInit();
-	AesInit();
-
 	TDEXLogShmemInit();
 	TDEXLogSmgrInit();
 }
@@ -96,23 +94,21 @@ _PG_init(void)
 
 	check_percona_api_version();
 
+	AesInit();
 	TdeGucInit();
 	TdeEventCaptureInit();
-
 	InitializePrincipalKeyInfo();
 	InitializeKeyProviderInfo();
-
-	prev_shmem_request_hook = shmem_request_hook;
-	shmem_request_hook = tde_shmem_request;
-	prev_shmem_startup_hook = shmem_startup_hook;
-	shmem_startup_hook = tde_shmem_startup;
-
 	InstallFileKeyring();
 	InstallVaultV2Keyring();
 	InstallKmipKeyring();
 	RegisterTdeRmgr();
-
 	RegisterStorageMgr();
+
+	prev_shmem_request_hook = shmem_request_hook;
+	shmem_request_hook = tde_shmem_request;
+	prev_shmem_startup_hook = shmem_startup_hook;
+	shmem_startup_hook = tde_shmem_startup;
 }
 
 static void