Add GCC push/pop pragmas to AEGIS code

Author: utelle

src/sqlite3mc_amalgamation.c

@@ -283228,6 +283228,7 @@ aegis_init(void)
     return 0;
 }
 
+#if 0
 #if defined(_MSC_VER)
 #    pragma section(".CRT$XCU", read)
 static void __cdecl _do_aegis_init(void);
@@ -283241,6 +283242,7 @@ _do_aegis_init(void)
 {
     (void) aegis_init();
 }
+#endif
 /*** End of #include "common/common.c" ***/
 
 /* #include "common/cpu.c" */
@@ -284030,6 +284032,10 @@ softaes_block_encrypt(const SoftAesBlock block, const SoftAesBlock rk)
 /*** End of #include "common/softaes.c" ***/
 
 
+#if defined(__GNUC__)
+#  pragma GCC push_options
+#endif
+
 /* AEGIS 128 L */
 /* #include "aegis128l/implementations.h" */
 /*** Begin of #include "aegis128l/implementations.h" ***/
@@ -318709,6 +318715,10 @@ aegis256x4_pick_best_implementation(void)
 }
 /*** End of #include "aegis256x4/aegis256x4.c" ***/
 
+
+#if defined(__GNUC__)
+#  pragma GCC pop_options
+#endif
 /*** End of #include "aegis/libaegis.c" ***/
 
 /* #include "argon2/libargon2.c" */
@@ -326573,12 +326583,12 @@ sqlite3mcFreeCodecParameterTable(void* ptr)
 
 static const CipherDescriptor mcSentinelDescriptor =
 {
-  "", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
+  "", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
 
 static const CipherDescriptor mcDummyDescriptor =
 {
-  "@dummy@", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
+  "@dummy@", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
 
 static CipherDescriptor globalCodecDescriptorTable[CODEC_COUNT_MAX + 1];
@@ -353762,6 +353772,7 @@ sqlite3mc_initialize(const char* arg)
 #if HAVE_CIPHER_AEGIS
   if (rc == SQLITE_OK)
   {
+    aegis_init();
     rc = sqlite3mcRegisterCipher(&mcAegisDescriptor, mcAegisParams, (CODEC_TYPE_AEGIS == CODEC_TYPE));
   }
 #endif