Prepare release of version 2.2.1

- update readme, CHANGELOG
- adjust signature of sqlite3mcExtractRawKey

Author: utelle

CHANGELOG.md

@@ -7,17 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.2.1] - 2025-07-09
+
 ### Added
 
-- Added plaintext header option to some ciphers (issue [#209](../../issues/209))
+- Added plaintext header option to some ciphers (issue [#209](../../issues/209))  
   This option, added to ciphers _chacha20_, _ascon128_, and _aegis_, keeps the database header partially unencrypted and works in the same way as for the cipher scheme _sqlcipher_.
 
 ### Changed
 
-- Simplified and unified raw key and salt specification
+- Simplified and unified raw key and salt specification  
   - raw keys (and optionally salt) can be given in both formats, _SQLCipher_ or _sqleet_, for all cipher schemes supporting raw key specification (_chacha20_, _sqlcipher_, _ascon128_, _aegis_)
   - the cipher salt can now also be specified via "pragma cipher_salt" - pragma takes precedence over URI parameter
-  - the "cipher" URI parameter is no longer mandatory for the default cipher scheme
+  - the "cipher" URI parameter is no longer mandatory for the **default** cipher scheme
 
 ## [2.2.0] - 2025-07-01
 
@@ -652,7 +654,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.2.0...HEAD
+[Unreleased]: ../../compare/v2.2.1...HEAD
+[2.2.1]: ../../compare/v2.2.0...v2.2.1
 [2.2.0]: ../../compare/v2.1.3...v2.2.0
 [2.1.3]: ../../compare/v2.1.2...v2.1.3
 [2.1.2]: ../../compare/v2.1.1...v2.1.2

autoconf/README.txt

@@ -1,4 +1,4 @@
-July 1, 2025
+July 9, 2025
 ============
 
 This package contains an experimental variant for "SQLite3 Multiple

autoconf/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1

readme.md

@@ -10,12 +10,10 @@ The code was mainly developed under Windows, but was tested under Linux as well.
 
 ## Version information
 
-* 2.2.0 - *July 2025*
+* 2.2.1 - *July 2025*
   - Based on SQLite version 3.50.2
-  - Removed dependency on security framework for Apple platforms
-  - Regenerated build files using premake5 5.0.0-beta7
-  - Added some patches for the SQLite shell source to handle extension inclusion
-  - Added source code amalgamation release package including "configure" based on _autosetup_
+  - Added plaintext header option to some ciphers (_chacha20_, _ascon128_, and _aegis_) (issue #209)
+  - Simplified and unified raw key and salt specification
 
 For further version information please consult the [CHANGELOG](CHANGELOG.md).
 

src/cipher_common.h

@@ -197,7 +197,7 @@ SQLITE_PRIVATE void sqlite3mcConvertHex2Bin(const unsigned char* hex, int len, u
 
 SQLITE_PRIVATE int sqlite3mcExtractRawKey(const char* password, int passwordLength,
                                           int keyOnly, int keyLength, int saltLength,
-                                          char* key, char* salt);
+                                          unsigned char* key, unsigned char* salt);
 
 SQLITE_PRIVATE int sqlite3mcConfigureFromUri(sqlite3* db, const char *zDbName, int configDefault);
 

src/cipher_config.c

@@ -951,7 +951,7 @@ sqlite3mcFileControlPragma(sqlite3* db, const char* zDbName, int op, void* pArg)
         {
           /* Save given cipher salt */
           if (sqlite3Strlen30(pragmaValue) >= 2 * KEYSALT_LENGTH &&
-              sqlite3mcIsHexKey(pragmaValue, 2 * KEYSALT_LENGTH))
+              sqlite3mcIsHexKey((unsigned char*) pragmaValue, 2 * KEYSALT_LENGTH))
           {
             char* cipherSalt = sqlite3_mprintf("%s", pragmaValue);
             if (sqlite3_set_clientdata(db, "sqlite3mc_cipher_salt", cipherSalt, sqlite3_free) != SQLITE_OK)

src/codec_algos.c

@@ -237,7 +237,7 @@ sqlite3mcConvertHex2Bin(const unsigned char* hex, int len, unsigned char* bin)
 SQLITE_PRIVATE int
 sqlite3mcExtractRawKey(const char* password, int passwordLength,
                        int keyOnly, int keyLength, int saltLength,
-                       char* key, char* salt)
+                       unsigned char* key, unsigned char* salt)
 {
   /* Bypass key derivation if the key string starts with "raw:" */
   int bypass = 0;