Prepare release of version 2.1.0

- Based on SQLite version 3.49.1
- Update libaegis sources to version 0.4.0

Author: utelle

CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.1.0] - 2025-03-01
+
+### Changed
+
+- Remove use of `SQLITE_EXTRA_INIT` and `SQLITE_EXTRA_SHUTDOWN`. Application can now use these precompiler symbols for their own purposes.
+- Split function `sqlite3mc_initialize()` into 2 parts:
+  1) initialization of cipher schemes,
+  2) loading builtin extensions automatically on opening a database
+- Disable cipher scheme AEGIS for MSVC 2015 and below - workaround for issue [#195](../../issues/195))
+
+### Fixed
+
+- Fixed issue [#194](../../issues/194)) - race condition when registering VFS
+
 ## [2.0.4] - 2025-02-18
 
 ### Changed
@@ -19,6 +33,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Based on SQLite version 3.49.0
 
+### Fixed
+
+- Fixed issue [#190](../../issues/190)) - build with clang compiler fails
+
 ## [2.0.2] - 2025-01-15
 
 ### Changed
@@ -590,7 +608,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.4...HEAD
+[Unreleased]: ../../compare/v2.1.0...HEAD
+[2.1.0]: ../../compare/v2.0.4...v2.1.0
 [2.0.4]: ../../compare/v2.0.3...v2.0.4
 [2.0.3]: ../../compare/v2.0.2...v2.0.3
 [2.0.2]: ../../compare/v2.0.1...v2.0.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.4], [[email protected]])
+AC_INIT([sqlite3mc], [2.1.0], [[email protected]])
 
 dnl This is the version tested with, might work with earlier ones.
 AC_PREREQ([2.69])

readme.md

@@ -10,8 +10,11 @@ The code was mainly developed under Windows, but was tested under Linux as well.
 
 ## Version information
 
-* 2.0.4 - *February 2025*
+* 2.1.0 - *March 2025*
   - Based on SQLite version 3.49.1
+  - Remove use of `SQLITE_EXTRA_INIT` and `SQLITE_EXTRA_SHUTDOWN`
+  - Disable cipher scheme AEGIS for MSVC 2015 and below - workaround for issue #195
+  - Fixed issue #194 - race condition when registering VFS
 
 For further version information please consult the [CHANGELOG](CHANGELOG.md).
 

src/aegis/aegis128x2/aegis128x2_common.h

@@ -216,7 +216,8 @@ AEGIS_mac_nr(uint8_t *mac, size_t maclen, uint64_t adlen, AEGIS_AES_BLOCK_T*stat
         tmp = AEGIS_AES_BLOCK_XOR(tmp, AEGIS_AES_BLOCK_XOR(state[1], state[0]));
         AEGIS_AES_BLOCK_STORE(t, tmp);
         for (i = 0; i < d / 2; i++) {
-            memcpy(r, t + i * 32, 32);
+            memcpy(r, t + i * 32, 16);
+            memcpy(r + AEGIS_RATE / 2, t + i * 32 + 16, 16);
             AEGIS_absorb(r, state);
         }
         tmp = AEGIS_AES_BLOCK_LOAD_64x2(maclen << 3, d);
@@ -240,7 +241,7 @@ AEGIS_mac_nr(uint8_t *mac, size_t maclen, uint64_t adlen, AEGIS_AES_BLOCK_T*stat
         AEGIS_AES_BLOCK_STORE(t + AES_BLOCK_LENGTH, tmp);
         for (i = 1; i < d; i++) {
             memcpy(r, t + i * 16, 16);
-            memcpy(r + 16, t + AES_BLOCK_LENGTH + i * 16, 16);
+            memcpy(r + AEGIS_RATE / 2, t + AES_BLOCK_LENGTH + i * 16, 16);
             AEGIS_absorb(r, state);
         }
         tmp = AEGIS_AES_BLOCK_LOAD_64x2(maclen << 3, d);

src/aegis/aegis128x4/aegis128x4_common.h

@@ -231,7 +231,8 @@ AEGIS_mac_nr(uint8_t *mac, size_t maclen, uint64_t adlen, AEGIS_AES_BLOCK_T *sta
         tmp = AEGIS_AES_BLOCK_XOR(tmp, AEGIS_AES_BLOCK_XOR(state[1], state[0]));
         AEGIS_AES_BLOCK_STORE(t, tmp);
         for (i = 0; i < d / 2; i++) {
-            memcpy(r, t + i * 32, 32);
+            memcpy(r, t + i * 32, 16);
+            memcpy(r + AEGIS_RATE / 2, t + i * 32 + 16, 16);
             AEGIS_absorb(r, state);
         }
         tmp = AEGIS_AES_BLOCK_LOAD_64x2(maclen << 3, d);
@@ -255,7 +256,7 @@ AEGIS_mac_nr(uint8_t *mac, size_t maclen, uint64_t adlen, AEGIS_AES_BLOCK_T *sta
         AEGIS_AES_BLOCK_STORE(t + AES_BLOCK_LENGTH, tmp);
         for (i = 1; i < d; i++) {
             memcpy(r, t + i * 16, 16);
-            memcpy(r + 16, t + AES_BLOCK_LENGTH + i * 16, 16);
+            memcpy(r + AEGIS_RATE / 2, t + AES_BLOCK_LENGTH + i * 16, 16);
             AEGIS_absorb(r, state);
         }
         tmp = AEGIS_AES_BLOCK_LOAD_64x2(maclen << 3, d);

src/sqlite3mc_version.h

@@ -13,9 +13,9 @@
 #define SQLITE3MC_VERSION_H_
 
 #define SQLITE3MC_VERSION_MAJOR      2
-#define SQLITE3MC_VERSION_MINOR      0
-#define SQLITE3MC_VERSION_RELEASE    4
+#define SQLITE3MC_VERSION_MINOR      1
+#define SQLITE3MC_VERSION_RELEASE    0
 #define SQLITE3MC_VERSION_SUBRELEASE 0
-#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 2.0.4"
+#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 2.1.0"
 
 #endif /* SQLITE3MC_VERSION_H_ */