Prepare release of wxSQLite3 4.12.2

- Upgrade to SQLite3 Multiple Ciphers version 2.3.2 (SQLite version 3.51.3)
- Use internally new API function sqlite3mc_cipher_name_copy instead of sqlite3mc_cipher_name

Author: utelle

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.12.2] - 2026-03-19
+
+- Upgrade to SQLite3 Multiple Ciphers version 2.3.2 (SQLite version 3.51.3)
+- Use internally new API function `sqlite3mc_cipher_name_copy` instead of `sqlite3mc_cipher_name`
+
 ## [4.12.1] - 2026-03-14
 
 - Upgrade to SQLite3 Multiple Ciphers version 2.3.1 (SQLite version 3.51.3)
@@ -728,7 +733,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - First public release
 
-[Unreleased]: ../../compare/v4.12.1...HEAD
+[Unreleased]: ../../compare/v4.12.2...HEAD
+[4.12.2]: ../../compare/v4.12.1...v4.12.2
 [4.12.1]: ../../compare/v4.12.0...v4.12.1
 [4.12.0]: ../../compare/v4.11.2...v4.12.0
 [4.11.2]: ../../compare/v4.11.1...v4.11.2

configure.ac

@@ -4,7 +4,7 @@ dnl Copyright (C) 2017-2026 Ulrich Telle <github@telle-online.de>, Vadim Zeitlin
 dnl
 dnl This file is covered by the same licence as the entire wxSQLite3 package.
 
-AC_INIT([wxsqlite3], [4.12.1], [github@telle-online.de])
+AC_INIT([wxsqlite3], [4.12.2], [github@telle-online.de])
 
 dnl This is the version tested with, might work with earlier ones.
 AC_PREREQ([2.69])

docs/Doxyfile

@@ -48,7 +48,7 @@ PROJECT_NAME           = wxSQLite3
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.12.0
+PROJECT_NUMBER         = 4.12.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewers a

include/wx/wxsqlite3_version.h

@@ -14,8 +14,8 @@
 
 #define WXSQLITE3_MAJOR_VERSION      4
 #define WXSQLITE3_MINOR_VERSION      12
-#define WXSQLITE3_RELEASE_NUMBER     1
+#define WXSQLITE3_RELEASE_NUMBER     2
 #define WXSQLITE3_SUBRELEASE_NUMBER  0
-#define WXSQLITE3_VERSION_STRING     "wxSQLite3 4.12.1"
+#define WXSQLITE3_VERSION_STRING     "wxSQLite3 4.12.2"
 
 #endif // WXSQLITE3_VERSION_H_

include/wx/wxsqlite3def.h

@@ -46,10 +46,17 @@
 
 <dl>
 
+<dt><b>4.12.2</b> - <i>March 2026</i></dt>
+<dd>
+Upgrade to <i>SQLite3 Multiple Ciphers version 2.3.2 (SQLite version 3.51.3)</i><br>
+Use internally new API function sqlite3mc_cipher_name_copy instead of sqlite3mc_cipher_name
+
+</dd>
+
 <dt><b>4.12.1</b> - <i>March 2026</i></dt>
 <dd>
 Upgrade to <i>SQLite3 Multiple Ciphers version 2.3.1 (SQLite version 3.51.3)</i><br>
-Downgrade to SQLite 3.51.3 due to withdrawl of SQLite 3.52.0
+Downgrade to SQLite 3.51.3 due to withdrawal of SQLite 3.52.0
 
 </dd>
 

readme.md

@@ -52,10 +52,9 @@ Currently the _CMake_ support is experimental and limited to Windows platforms (
 
 ## <a name="history"></a>Version history
 
-* 4.12.1 - *March 2026*
+* 4.12.2 - *March 2026*
 
-  - Upgrade to SQLite3 Multiple Ciphers version 2.3.1 (SQLite version 3.51.3)
-  - Downgrade to SQLite 3.51.3 due to withdrawal of SQLite 3.52.0
+  - Upgrade to SQLite3 Multiple Ciphers version 2.3.2 (SQLite version 3.51.3)
 
 For further version information please consult the [CHANGELOG](CHANGELOG.md).
 

src/sqlite3mc_amalgamation.c

@@ -266377,7 +266377,7 @@ SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
 ** Purpose:     Header file for SQLite3 Multiple Ciphers support
 ** Author:      Ulrich Telle
 ** Created:     2020-03-01
-** Copyright:   (c) 2019-2024 Ulrich Telle
+** Copyright:   (c) 2019-2026 Ulrich Telle
 ** License:     MIT
 */
 
@@ -266405,9 +266405,9 @@ SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; }
 
 #define SQLITE3MC_VERSION_MAJOR      2
 #define SQLITE3MC_VERSION_MINOR      3
-#define SQLITE3MC_VERSION_RELEASE    1
+#define SQLITE3MC_VERSION_RELEASE    2
 #define SQLITE3MC_VERSION_SUBRELEASE 0
-#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 2.3.1"
+#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 2.3.2"
 
 #endif /* SQLITE3MC_VERSION_H_ */
 /*** End of #include "sqlite3mc_version.h" ***/
@@ -280476,6 +280476,7 @@ SQLITE_API void sqlite3_activate_see(const char* zPassPhrase);
 SQLITE_API int sqlite3mc_cipher_count();
 SQLITE_API int sqlite3mc_cipher_index(const char* cipherName);
 SQLITE_API const char* sqlite3mc_cipher_name(int cipherIndex);
+SQLITE_API int sqlite3mc_cipher_name_copy(int cipherIndex, char* cipherName, int maxCipherNameSize);
 SQLITE_API int sqlite3mc_config(sqlite3* db, const char* paramName, int newValue);
 SQLITE_API int sqlite3mc_config_cipher(sqlite3* db, const char* cipherName, const char* paramName, int newValue);
 SQLITE_API unsigned char* sqlite3mc_codec_data(sqlite3* db, const char* zDbName, const char* paramName);
@@ -286409,7 +286410,7 @@ void RijndaelInvalidate(Rijndael* rijndael)
 /*
 ** Name:        libaegis.c
 ** Purpose:     Amalgamation of the AEGIS library
-** Copyright:   (c) 2024-2025 Ulrich Telle
+** Copyright:   (c) 2024-2026 Ulrich Telle
 ** SPDX-License-Identifier: MIT
 */
 
@@ -286424,6 +286425,63 @@ void RijndaelInvalidate(Rijndael* rijndael)
 #define AEGIS_PRIVATE static
 #endif
 
+/* Namespacing to avoid conflicts with libsodium 1.0.21+ */
+
+/* Base Implementation Structs */
+#define aegis128l_implementation             sqlite3mc_aegis128l_implementation
+#define aegis128lx2_implementation           sqlite3mc_aegis128lx2_implementation
+#define aegis128lx4_implementation           sqlite3mc_aegis128lx4_implementation
+#define aegis256_implementation              sqlite3mc_aegis256_implementation
+#define aegis256x2_implementation            sqlite3mc_aegis256x2_implementation
+#define aegis256x4_implementation            sqlite3mc_aegis256x4_implementation
+
+/* Variants without hardware acceleration */
+#define aegis128l_soft_implementation        sqlite3mc_aegis128l_soft_implementation
+#define aegis128x2_soft_implementation       sqlite3mc_aegis128x2_soft_implementation
+#define aegis128x4_soft_implementation       sqlite3mc_aegis128x4_soft_implementation
+#define aegis256_soft_implementation         sqlite3mc_aegis256_soft_implementation
+#define aegis256x2_soft_implementation       sqlite3mc_aegis256x2_soft_implementation
+#define aegis256x4_soft_implementation       sqlite3mc_aegis256x4_soft_implementation
+
+#define softaes_block_encrypt                sqlite3mc_softaes_block_encrypt
+
+/* Variants with support for AES and AVX instruction sets */
+#define aegis128l_aesni_implementation       sqlite3mc_aegis128l_aesni_implementation
+#define aegis128x2_aesni_implementation      sqlite3mc_aegis128x2_aesni_implementation
+#define aegis128x4_aesni_implementation      sqlite3mc_aegis128x4_aesni_implementation
+#define aegis256_aesni_implementation        sqlite3mc_aegis256_aesni_implementation
+#define aegis256x2_aesni_implementation      sqlite3mc_aegis256x2_aesni_implementation
+#define aegis256x4_aesni_implementation      sqlite3mc_aegis256x4_aesni_implementation
+
+/* Variants with support for VAES and AVX2 instruction sets */
+#define aegis128x2_avx2_implementation       sqlite3mc_aegis128x2_avx2_implementation
+#define aegis128x4_avx2_implementation       sqlite3mc_aegis128x4_avx2_implementation
+#define aegis256x2_avx2_implementation       sqlite3mc_aegis256x2_avx2_implementation
+#define aegis256x4_avx2_implementation       sqlite3mc_aegis256x4_avx2_implementation
+
+/* Variants with support for AVX512F instruction sets */
+#define aegis128x4_avx512_implementation     sqlite3mc_aegis128x4_avx512_implementation
+#define aegis256x4_avx512_implementation     sqlite3mc_aegis256x4_avx512_implementation
+
+/* Variants with support for AltiVec instruction sets */
+#define aegis128l_altivec_implementation     sqlite3mc_aegis128l_altivec_implementation
+#define aegis128x2_altivec_implementation    sqlite3mc_aegis128x2_altivec_implementation
+#define aegis128x4_altivec_implementation    sqlite3mc_aegis128x4_altivec_implementation
+#define aegis256_altivec_implementation      sqlite3mc_aegis256_altivec_implementation
+#define aegis256x2_altivec_implementation    sqlite3mc_aegis256x2_altivec_implementation
+#define aegis256x4_altivec_implementation    sqlite3mc_aegis256x4_altivec_implementation
+
+/* Variants with support for ARM Neon instruction sets */
+#define aegis128l_armcrypto_implementation   sqlite3mc_aegis128l_armcrypto_implementation
+#define aegis128x2_armcrypto_implementation  sqlite3mc_aegis128x2_armcrypto_implementation
+#define aegis128x4_armcrypto_implementation  sqlite3mc_aegis128x4_armcrypto_implementation
+#define aegis256_armcrypto_implementation    sqlite3mc_aegis256_armcrypto_implementation
+#define aegis256x2_armcrypto_implementation  sqlite3mc_aegis256x2_armcrypto_implementation
+#define aegis256x4_armcrypto_implementation  sqlite3mc_aegis256x4_armcrypto_implementation
+
+/* Internal Tables (can conflict under -flto) */
+#define _aes_lut                             sqlite3mc_aegis_aes_lut
+
 /* #include "common/cpu.h" */
 /*** Begin of #include "common/cpu.h" ***/
 /*
@@ -307708,12 +307766,10 @@ extern struct aegis128x4_implementation aegis128x4_avx512_implementation;
 #ifdef HAVE_VAESINTRIN_H
 
 #ifdef __clang__
-#  if __clang_major__ >= 18
-#    pragma clang attribute push(__attribute__((target("vaes,avx512f,evex512"))), \
-                                             apply_to = function)
+#  if __clang_major__ >= 18 && __clang_major__ < 22
+#    pragma clang attribute push(__attribute__((target("aes,vaes,avx512f,evex512"))), apply_to=function)
 #  else
-#    pragma clang attribute push(__attribute__((target("vaes,avx512f"))), \
-                                             apply_to = function)
+#    pragma clang attribute push(__attribute__((target("aes,vaes,avx512f"))), apply_to=function)
 #  endif
 #elif defined(__GNUC__)
 #  pragma GCC target("vaes,avx512f")
@@ -308855,12 +308911,10 @@ extern struct aegis256x4_implementation aegis256x4_avx512_implementation;
 #ifdef HAVE_VAESINTRIN_H
 
 #ifdef __clang__
-#  if __clang_major__ >= 18
-#    pragma clang attribute push(__attribute__((target("vaes,avx512f,evex512"))), \
-                                             apply_to = function)
+#  if __clang_major__ >= 18 && __clang_major__ < 22
+#    pragma clang attribute push(__attribute__((target("vaes,avx512f,evex512"))), apply_to=function)
 #  else
-#    pragma clang attribute push(__attribute__((target("vaes,avx512f"))), \
-                                             apply_to = function)
+#    pragma clang attribute push(__attribute__((target("vaes,avx512f"))), apply_to=function)
 #  endif
 #elif defined(__GNUC__)
 #  pragma GCC target("vaes,avx512f")
@@ -333299,7 +333353,7 @@ sqlite3mcConfigureSQLCipherVersion(sqlite3* db, int configDefault, int legacyVer
 ** Purpose:     Configuration of SQLite codecs
 ** Author:      Ulrich Telle
 ** Created:     2020-03-02
-** Copyright:   (c) 2006-2024 Ulrich Telle
+** Copyright:   (c) 2006-2026 Ulrich Telle
 ** License:     MIT
 */
 
@@ -333481,18 +333535,17 @@ sqlite3mc_cipher_index(const char* cipherName)
   return (j < count && globalCodecDescriptorTable[j].m_name[0] != 0) ? j + 1 : -1;
 }
 
-SQLITE_API const char*
-sqlite3mc_cipher_name(int cipherIndex)
+static const char*
+sqlite3mcFindCipherName(int cipherIndex)
 {
-  static char cipherName[CIPHER_NAME_MAXLEN] = "";
+  const char* cipherName = NULL;
   int count;
   int j;
 #ifndef SQLITE_OMIT_AUTOINIT
-  if( sqlite3_initialize() ) return cipherName;
+  if (sqlite3_initialize()) return NULL;
 #endif
   count = sqlite3mcGetGlobalCipherCount();
   j = 0;
-  cipherName[0] = '\0';
   if (cipherIndex > 0 && cipherIndex <= count)
   {
     for (j = 0; j < count && globalCodecDescriptorTable[j].m_name[0] != 0; ++j)
@@ -333501,13 +333554,57 @@ sqlite3mc_cipher_name(int cipherIndex)
     }
     if (j < count && globalCodecDescriptorTable[j].m_name[0] != 0)
     {
-      strncpy(cipherName, globalCodecDescriptorTable[j].m_name, CIPHER_NAME_MAXLEN - 1);
-      cipherName[CIPHER_NAME_MAXLEN - 1] = '\0';
+      cipherName = globalCodecDescriptorTable[j].m_name;
     }
   }
   return cipherName;
 }
 
+SQLITE_API const char*
+sqlite3mc_cipher_name(int cipherIndex)
+{
+  static char cipherName[CIPHER_NAME_MAXLEN] = "";
+  const char* globalCipherName = sqlite3mcFindCipherName(cipherIndex);
+  if (globalCipherName)
+  {
+    strncpy(cipherName, globalCipherName, CIPHER_NAME_MAXLEN - 1);
+    cipherName[CIPHER_NAME_MAXLEN - 1] = '\0';
+  }
+  else
+  {
+    cipherName[0] = '\0';
+  }
+  return cipherName;
+}
+
+SQLITE_API int
+sqlite3mc_cipher_name_copy(int cipherIndex, char* cipherName, int maxCipherNameSize)
+{
+  int ok = 1;
+  const char* globalCipherName = sqlite3mcFindCipherName(cipherIndex);
+  if (globalCipherName)
+  {
+    int cipherNameLen = (int)strlen(globalCipherName) + 1;
+    if (maxCipherNameSize >= cipherNameLen)
+    {
+      strncpy(cipherName, globalCipherName, maxCipherNameSize - 1);
+      cipherName[maxCipherNameSize - 1] = '\0';
+    }
+    else
+    {
+      /* Buffer too small, return negative value of minimum required buffer length */
+      ok = -cipherNameLen;
+    }
+  }
+  else
+  {
+    /* Invalid index */
+    cipherName[0] = '\0';
+    ok = 0;
+  }
+  return ok;
+}
+
 static
 int checkParameterValue(const char* paramName, int value, const char* cipherName)
 {
@@ -334051,16 +334148,16 @@ sqlite3mcConfigureFromUri(sqlite3* db, const char* zDbName, int configDefault)
   {
     /* Check whether cipher is specified */
     const char* cipherName = sqlite3_uri_parameter(dbFileName, "cipher");
-    if (cipherName == NULL)
+    if (cipherName == NULL || cipherName[0] == 0)
     {
       int defaultCipherIndex = sqlite3mc_config(db, "cipher", -1);
       if (defaultCipherIndex > 0)
       {
-        cipherName = sqlite3mc_cipher_name(defaultCipherIndex);
+        cipherName = sqlite3mcFindCipherName(defaultCipherIndex);
         sqlite3mc_config(db, "cipher", defaultCipherIndex);
       }
     }
-    if (cipherName != NULL)
+    if (cipherName != NULL && cipherName[0] != 0)
     {
       int j = 0;
       CipherParams* cipherParams = NULL;

src/sqlite3mc_amalgamation.h

@@ -3,7 +3,7 @@
 ** Purpose:     Header file for SQLite3 Multiple Ciphers support
 ** Author:      Ulrich Telle
 ** Created:     2020-03-01
-** Copyright:   (c) 2019-2024 Ulrich Telle
+** Copyright:   (c) 2019-2026 Ulrich Telle
 ** License:     MIT
 */
 
@@ -31,9 +31,9 @@
 
 #define SQLITE3MC_VERSION_MAJOR      2
 #define SQLITE3MC_VERSION_MINOR      3
-#define SQLITE3MC_VERSION_RELEASE    1
+#define SQLITE3MC_VERSION_RELEASE    2
 #define SQLITE3MC_VERSION_SUBRELEASE 0
-#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 2.3.1"
+#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 2.3.2"
 
 #endif /* SQLITE3MC_VERSION_H_ */
 /*** End of #include "sqlite3mc_version.h" ***/
@@ -14102,6 +14102,7 @@ SQLITE_API void sqlite3_activate_see(const char* zPassPhrase);
 SQLITE_API int sqlite3mc_cipher_count();
 SQLITE_API int sqlite3mc_cipher_index(const char* cipherName);
 SQLITE_API const char* sqlite3mc_cipher_name(int cipherIndex);
+SQLITE_API int sqlite3mc_cipher_name_copy(int cipherIndex, char* cipherName, int maxCipherNameSize);
 SQLITE_API int sqlite3mc_config(sqlite3* db, const char* paramName, int newValue);
 SQLITE_API int sqlite3mc_config_cipher(sqlite3* db, const char* cipherName, const char* paramName, int newValue);
 SQLITE_API unsigned char* sqlite3mc_codec_data(sqlite3* db, const char* zDbName, const char* paramName);

src/wxsqlite3.cpp

@@ -5696,22 +5696,28 @@ wxSQLite3Cipher::GetCipher(wxSQLite3Database& db)
 {
   sqlite3* dbHandle = (sqlite3*) GetDatabaseHandle(db);
   int cipherType = sqlite3mc_config(dbHandle, "cipher", -1);
-  return GetCipherType(sqlite3mc_cipher_name(cipherType));
+  char cipherName[32] = "";
+  int rc = sqlite3mc_cipher_name_copy(cipherType, cipherName, 32);
+  return GetCipherType(wxString((rc == 1) ? cipherName : ""));
 }
 
 wxSQLite3CipherType
 wxSQLite3Cipher::GetCipherDefault(wxSQLite3Database& db)
 {
   sqlite3* dbHandle = (sqlite3*) GetDatabaseHandle(db);
   int cipherType = sqlite3mc_config(dbHandle, "default:cipher", -1);
-  return GetCipherType(sqlite3mc_cipher_name(cipherType));
+  char cipherName[32] = "";
+  int rc = sqlite3mc_cipher_name_copy(cipherType, cipherName, 32);
+  return GetCipherType(wxString((rc == 1) ? cipherName : ""));
 }
 
 wxSQLite3CipherType
 wxSQLite3Cipher::GetGlobalCipherDefault()
 {
   int cipherType = sqlite3mc_config(0, "default:cipher", -1);
-  return GetCipherType(sqlite3mc_cipher_name(cipherType));
+  char cipherName[32] = "";
+  int rc = sqlite3mc_cipher_name_copy(cipherType, cipherName, 32);
+  return GetCipherType(wxString((rc == 1) ? cipherName : ""));
 }
 
 int