Skip to content

Commit 5486f9a

Browse files
committed
SQLite3 Multiple Ciphers 2.0.1 (based on SQLite 3.47.2)
* Based on SQLite version 3.47.2 * Fixed issue ultimatepp#186 - crashes due to illegal instruction exception on some Linux systems * Fixed issue ultimatepp#185 - missing header file and include path in CMake build file
1 parent 8f15a44 commit 5486f9a

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

uppsrc/plugin/sqlite3/lib/sqlite3mc_amalgamation.c

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260902,7 +260902,7 @@ SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
260902260902
** Purpose: SQLite3 Multiple Ciphers version numbers
260903260903
** Author: Ulrich Telle
260904260904
** Created: 2020-08-05
260905-
** Copyright: (c) 2020-2024 Ulrich Telle
260905+
** Copyright: (c) 2020-2025 Ulrich Telle
260906260906
** License: MIT
260907260907
*/
260908260908

@@ -260913,9 +260913,9 @@ SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
260913260913

260914260914
#define SQLITE3MC_VERSION_MAJOR 2
260915260915
#define SQLITE3MC_VERSION_MINOR 0
260916-
#define SQLITE3MC_VERSION_RELEASE 0
260916+
#define SQLITE3MC_VERSION_RELEASE 1
260917260917
#define SQLITE3MC_VERSION_SUBRELEASE 0
260918-
#define SQLITE3MC_VERSION_STRING "SQLite3 Multiple Ciphers 2.0.0"
260918+
#define SQLITE3MC_VERSION_STRING "SQLite3 Multiple Ciphers 2.0.1"
260919260919

260920260920
#endif /* SQLITE3MC_VERSION_H_ */
260921260921
/*** End of #include "sqlite3mc_version.h" ***/
@@ -283228,6 +283228,7 @@ aegis_init(void)
283228283228
return 0;
283229283229
}
283230283230

283231+
#if 0
283231283232
#if defined(_MSC_VER)
283232283233
# pragma section(".CRT$XCU", read)
283233283234
static void __cdecl _do_aegis_init(void);
@@ -283241,6 +283242,7 @@ _do_aegis_init(void)
283241283242
{
283242283243
(void) aegis_init();
283243283244
}
283245+
#endif
283244283246
/*** End of #include "common/common.c" ***/
283245283247

283246283248
/* #include "common/cpu.c" */
@@ -284030,6 +284032,10 @@ softaes_block_encrypt(const SoftAesBlock block, const SoftAesBlock rk)
284030284032
/*** End of #include "common/softaes.c" ***/
284031284033

284032284034

284035+
#if defined(__GNUC__)
284036+
# pragma GCC push_options
284037+
#endif
284038+
284033284039
/* AEGIS 128 L */
284034284040
/* #include "aegis128l/implementations.h" */
284035284041
/*** Begin of #include "aegis128l/implementations.h" ***/
@@ -318709,6 +318715,10 @@ aegis256x4_pick_best_implementation(void)
318709318715
}
318710318716
/*** End of #include "aegis256x4/aegis256x4.c" ***/
318711318717

318718+
318719+
#if defined(__GNUC__)
318720+
# pragma GCC pop_options
318721+
#endif
318712318722
/*** End of #include "aegis/libaegis.c" ***/
318713318723

318714318724
/* #include "argon2/libargon2.c" */
@@ -326573,12 +326583,12 @@ sqlite3mcFreeCodecParameterTable(void* ptr)
326573326583

326574326584
static const CipherDescriptor mcSentinelDescriptor =
326575326585
{
326576-
"", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
326586+
"", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
326577326587
};
326578326588

326579326589
static const CipherDescriptor mcDummyDescriptor =
326580326590
{
326581-
"@dummy@", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
326591+
"@dummy@", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
326582326592
};
326583326593

326584326594
static CipherDescriptor globalCodecDescriptorTable[CODEC_COUNT_MAX + 1];
@@ -353762,6 +353772,7 @@ sqlite3mc_initialize(const char* arg)
353762353772
#if HAVE_CIPHER_AEGIS
353763353773
if (rc == SQLITE_OK)
353764353774
{
353775+
aegis_init();
353765353776
rc = sqlite3mcRegisterCipher(&mcAegisDescriptor, mcAegisParams, (CODEC_TYPE_AEGIS == CODEC_TYPE));
353766353777
}
353767353778
#endif

uppsrc/plugin/sqlite3/lib/sqlite3mc_amalgamation.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
** Purpose: SQLite3 Multiple Ciphers version numbers
2121
** Author: Ulrich Telle
2222
** Created: 2020-08-05
23-
** Copyright: (c) 2020-2024 Ulrich Telle
23+
** Copyright: (c) 2020-2025 Ulrich Telle
2424
** License: MIT
2525
*/
2626

@@ -31,9 +31,9 @@
3131

3232
#define SQLITE3MC_VERSION_MAJOR 2
3333
#define SQLITE3MC_VERSION_MINOR 0
34-
#define SQLITE3MC_VERSION_RELEASE 0
34+
#define SQLITE3MC_VERSION_RELEASE 1
3535
#define SQLITE3MC_VERSION_SUBRELEASE 0
36-
#define SQLITE3MC_VERSION_STRING "SQLite3 Multiple Ciphers 2.0.0"
36+
#define SQLITE3MC_VERSION_STRING "SQLite3 Multiple Ciphers 2.0.1"
3737

3838
#endif /* SQLITE3MC_VERSION_H_ */
3939
/*** End of #include "sqlite3mc_version.h" ***/

0 commit comments

Comments
 (0)