Prepare release of version 2.0.2

- Based on SQLite version 3.48.0

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.2] - 2025-01-15
+
+### Changed
+
+- Based on SQLite version 3.48.0
+
 ## [2.0.1] - 2025-01-06
 
 ### Fixed
@@ -572,7 +578,8 @@ The following ciphers are supported:
 - AES 256 Bit CBC - SHA1/SHA256/SHA512 HMAC ([SQLCipher](https://www.zetetic.net/sqlcipher/), database versions 1, 2, 3, and 4)
 - RC4 - No HMAC ([System.Data.SQLite](http://system.data.sqlite.org))
 
-[Unreleased]: ../../compare/v2.0.1...HEAD
+[Unreleased]: ../../compare/v2.0.2...HEAD
+[2.0.2]: ../../compare/v2.0.1...v2.0.2
 [2.0.1]: ../../compare/v2.0.0...v2.0.1
 [2.0.0]: ../../compare/v1.9.2...v2.0.0
 [1.9.2]: ../../compare/v1.9.1...v1.9.2

configure.ac

@@ -4,7 +4,7 @@ dnl Copyright (C) 2019-2025 Ulrich Telle <[email protected]>
 dnl
 dnl This file is covered by the same licence as the entire SQLite3 Multiple Ciphers package.
 
-AC_INIT([sqlite3mc], [2.0.1], [[email protected]])
+AC_INIT([sqlite3mc], [2.0.2], [[email protected]])
 
 dnl This is the version tested with, might work with earlier ones.
 AC_PREREQ([2.69])
@@ -95,6 +95,15 @@ AC_ARG_WITH([ascon128],
 AS_IF([test "x$with_ascon128" = xno],
     [AC_DEFINE([HAVE_CIPHER_ASCON128], [0], [Define if you have Ascon-128  disabled])])
 
+AC_ARG_WITH([aegis],
+    [AS_HELP_STRING([--without-aegis],
+        [Disable support for AEGIS Encryption])],
+    [],
+    [with_aegis=yes])
+
+AS_IF([test "x$with_aegis" = xno],
+    [AC_DEFINE([HAVE_CIPHER_AEGIS], [0], [Define if you have AEGIS disabled])])
+
 dnl Enable cipher codec
 
 AC_ARG_ENABLE(codec,
@@ -104,7 +113,8 @@ AC_ARG_ENABLE(codec,
                               chacha20 [default]: ChaCha20-Poly1305 Encryption
                               sqlcipher: SQLCipher Encryption
                               rc4: System.Data.SQLite RC4 Encryption
-                              ascon128: Ascon-128 Encryption],
+                              ascon128: Ascon-128 Encryption
+                              aegis: AEGIS Encryption],
       [if   test "x$enableval" = "xaes128" && test "x$with_aes128cbc" = xyes ; then
         codec_type=CODEC_TYPE_AES128
       elif test "x$enableval" = "xaes256" && test "x$with_aes256cbc" = xyes ; then
@@ -117,6 +127,8 @@ AC_ARG_ENABLE(codec,
         codec_type=CODEC_TYPE_RC4
       elif test "x$enableval" = "xascon128" && test "x$with_ascon128" = xyes ; then
         codec_type=CODEC_TYPE_ASCON128
+      elif test "x$enableval" = "xaegis" && test "x$with_aegis" = xyes ; then
+        codec_type=CODEC_TYPE_AEGIS
       else
         echo
         echo "Error!"
@@ -131,7 +143,8 @@ AS_IF([test "x$with_aes128cbc" = xno &&
        test "x$with_chacha20" = xno &&
        test "x$with_sqlcipher" = xno &&
        test "x$with_rc4" = xno &&
-       test "x$with_ascon128" = xno],
+       test "x$with_ascon128" = xno &&
+       test "x$with_aegis" = xno],
        [AC_DEFINE([SQLITE_HAS_CODEC], [0], [All ciphers disabled so encryption is disabled])])
 
 dnl Check for zlib

readme.md

@@ -10,10 +10,8 @@ The code was mainly developed under Windows, but was tested under Linux as well.
 
 ## Version information
 
-* 2.0.1 - *January 2025*
-  - Based on SQLite version 3.47.2
-  - Fixed issue #186 - crashes due to _illegal instruction_ exception on some Linux systems
-  - Fixed issue #185 - missing header file and include path in CMake build file
+* 2.0.2 - *January 2025*
+  - Based on SQLite version 3.48.0
 
 For further version information please consult the [CHANGELOG](CHANGELOG.md).
 

scripts/patchshell.sh

@@ -18,6 +18,6 @@ sed -e '/^      sputf(stdout, "SQLite version/{n;N;d}' "$INPUT" \
   | sed '/#ifdef SQLITE_CUSTOM_INCLUDE/!{p;d;};n;n;n;a #if SQLITE3MC_USE_MINIZ != 0 && !defined(SQLITE_ENABLE_COMPRESS)\n#include "miniz.c"\n#ifdef SQLITE_HAVE_ZLIB\n#undef SQLITE_HAVE_ZLIB\n#endif\n#define SQLITE_HAVE_ZLIB 1\n#endif\n' \
   | sed '/#include <zlib.h>/c #include "zlibwrap.h"' \
   | sed '/^      sqlite3_fprintf(stdout,$/c \      extern char* sqlite3mc_version();\n      sqlite3_fprintf(stdout,' \
-  | sed '/^            "SQLite version/c \            "SQLite version \%s \%.19s%s" \/\*extra-version-info\*\/\n            " (\%s)\\n" \/\*SQLite3-Multiple-Ciphers-version-info\*\/' \
-  | sed '/^            sqlite3_libversion(), sqlite3_sourceid(), SHELL_CIO_CHAR_SET);/c \            sqlite3_libversion(), sqlite3_sourceid(), SHELL_CIO_CHAR_SET, sqlite3mc_version());' \
+  | sed '/^            "SQLite version/c \            "SQLite version \%s \%.19s" \/\*extra-version-info\*\/\n            " (\%s)\\n" \/\*SQLite3-Multiple-Ciphers-version-info\*\/' \
+  | sed '/^            sqlite3_libversion(), sqlite3_sourceid());/c \            sqlite3_libversion(), sqlite3_sourceid(), sqlite3mc_version());' \
   | sed '/^          sqlite3_libversion(), sqlite3_sourceid());/a \    extern char* sqlite3mc_version();\n    sqlite3_fprintf(p->out, "\%s\\n", sqlite3mc_version());'

src/fileio.c

@@ -437,7 +437,7 @@ static int writeFile(
 
     GetSystemTime(&currentTime);
     SystemTimeToFileTime(&currentTime, &lastAccess);
-    intervals = Int32x32To64(mtime, 10000000) + 116444736000000000;
+    intervals = (mtime*10000000) + 116444736000000000;
     lastWrite.dwLowDateTime = (DWORD)intervals;
     lastWrite.dwHighDateTime = intervals >> 32;
     zUnicodeName = sqlite3_win32_utf8_to_unicode(zFile);

src/regexp.c

@@ -656,7 +656,8 @@ static const char *re_subcompile_string(ReCompiled *p){
 ** regular expression.  Applications should invoke this routine once
 ** for every call to re_compile() to avoid memory leaks.
 */
-static void re_free(ReCompiled *pRe){
+static void re_free(void *p){
+  ReCompiled *pRe = (ReCompiled*)p;
   if( pRe ){
     sqlite3_free(pRe->aOp);
     sqlite3_free(pRe->aArg);

src/rekeyvacuum.c

@@ -27,7 +27,7 @@
 ** Change 4: Call sqlite3mcBtreeSetPageSize instead of sqlite3BtreeSetPageSize for main database
 **           (sqlite3mcBtreeSetPageSize allows to reduce the number of reserved bytes)
 **
-** This code is generated by the script rekeyvacuum.sh from SQLite version 3.47.2 amalgamation.
+** This code is generated by the script rekeyvacuum.sh from SQLite version 3.48.0 amalgamation.
 */
 SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3mcRunVacuumForRekey(
   char **pzErrMsg,        /* Write error message here */

src/shathree.c

@@ -12,7 +12,7 @@
 **
 ** This SQLite extension implements functions that compute SHA3 hashes
 ** in the way described by the (U.S.) NIST FIPS 202 SHA-3 Standard.
-** Two SQL functions are implemented:
+** Three SQL functions are implemented:
 **
 **     sha3(X,SIZE)
 **     sha3_agg(Y,SIZE)