Prepare release of version 1.9.1

- Based on SQLite version 3.47.1 - Remove need to specify AES hw compile time options
utelle · Nov 26, 2024 · d557e6b · d557e6b
1 parent 1919339
commit d557e6b
Show file tree

Hide file tree

Showing 13 changed files with 655 additions and 527 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.9.1] - 2024-11-26
+
+### Changed
+
+- Based on SQLite version 3.47.1
+- Remove need to specify AES hw compile time options
+
 ## [1.9.0] - 2024-10-22
 
 ### Changed
@@ -533,7 +540,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/v1.9.0...HEAD
+[Unreleased]: ../../compare/v1.9.1...HEAD
+[1.9.1]: ../../compare/v1.8.7...v1.9.1
 [1.9.0]: ../../compare/v1.8.7...v1.9.0
 [1.8.7]: ../../compare/v1.8.6...v1.8.7
 [1.8.6]: ../../compare/v1.8.5...v1.8.6

diff --git a/Makefile.am b/Makefile.am
@@ -1,14 +1,14 @@
 # Process this file with automake to create Makefile.in for sqlite3mc library
 #
-# Copyright (C) 2019-2023 Ulrich Telle <[email protected]>
+# Copyright (C) 2019-2024 Ulrich Telle <[email protected]>
 #
 # This file is covered by the same licence as the entire SQLite3 Multiple Ciphers package.
 
-if HOST_X86
-X86_FLAGS = -msse4.2 -maes 
-else
+#if HOST_X86
+#X86_FLAGS = -msse4.2 -maes 
+#else
 X86_FLAGS =
-endif
+#endif
 
 if HOST_ARM
 #ARM_FLAGS = -march=native 

diff --git a/configure.ac b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (C) 2019-2024 Ulrich Telle <[email protected]>
 dnl
 dnl This file is covered by the same licence as the entire SQLite3 Multiple Ciphers package.
 
-AC_INIT([sqlite3mc], [1.9.0], [[email protected]])
+AC_INIT([sqlite3mc], [1.9.1], [[email protected]])
 
 dnl This is the version tested with, might work with earlier ones.
 AC_PREREQ([2.69])

diff --git a/premake5.lua b/premake5.lua
@@ -39,7 +39,7 @@ project "sqlite3mc_lib"
     end
   else
     toolset("gcc")
-    buildoptions { "-msse4.2", "-maes" }
+--    buildoptions { "-msse4.2", "-maes" }
 --    buildoptions { "-march=native" }
   end
   makesettings { "include config.gcc" }
@@ -135,7 +135,7 @@ project "sqlite3mc_dll"
     end
   else
     toolset("gcc")
-    buildoptions { "-msse4.2", "-maes" }
+--    buildoptions { "-msse4.2", "-maes" }
 --    buildoptions { "-march=native" }
   end
   makesettings { "include config.gcc" }
@@ -227,7 +227,7 @@ project "sqlite3mc_shell"
     end
   else
     toolset("gcc")
-    buildoptions { "-msse4.2", "-maes" }
+--    buildoptions { "-msse4.2", "-maes" }
 --    buildoptions { "-march=native" }
   end
   makesettings { "include config.gcc" }
@@ -286,7 +286,7 @@ project "sqlite3mc_libicu"
     end
   else
     toolset("gcc")
-    buildoptions { "-msse4.2", "-maes" }
+--    buildoptions { "-msse4.2", "-maes" }
 --    buildoptions { "-march=native" }
   end
   makesettings { "include config.gcc" }
@@ -383,7 +383,7 @@ project "sqlite3mc_dllicu"
     end
   else
     toolset("gcc")
-    buildoptions { "-msse4.2", "-maes" }
+--    buildoptions { "-msse4.2", "-maes" }
 --    buildoptions { "-march=native" }
   end
   makesettings { "include config.gcc" }
@@ -488,7 +488,7 @@ project "sqlite3mc_shellicu"
     end
   else
     toolset("gcc")
-    buildoptions { "-msse4.2", "-maes" }
+--    buildoptions { "-msse4.2", "-maes" }
 --    buildoptions { "-march=native" }
   end
   makesettings { "include config.gcc" }

diff --git a/readme.md b/readme.md
@@ -10,10 +10,9 @@ The code was mainly developed under Windows, but was tested under Linux as well.
 
 ## Version information
 
-* 1.9.0 - *October 2024*
-  - Based on SQLite version 3.47.0
-  - Changed signature of cipher scheme method `GenerateKey` (affects only developers of dynamic cipher schemes)
-  - Using differing KDF and HMAC algorithms resulted in databases incompatible with the original SQLCipher library. Setting the parameter `hmac_algorithm_compat` to 0 restores the (incompatible) behaviour.
+* 1.9.1 - *November 2024*
+  - Based on SQLite version 3.47.1
+  - Remove need to specify AES hw compile time options
 
 For further version information please consult the [CHANGELOG](CHANGELOG.md).
 

diff --git a/src/rekeyvacuum.c b/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.0 amalgamation.
+** This code is generated by the script rekeyvacuum.sh from SQLite version 3.47.1 amalgamation.
 */
 SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3mcRunVacuumForRekey(
   char **pzErrMsg,        /* Write error message here */

diff --git a/src/series.c b/src/series.c
@@ -659,31 +659,37 @@ static int seriesBestIndex(
       continue;
     }
     if( pConstraint->iColumn<SERIES_COLUMN_START ){
-      if( pConstraint->iColumn==SERIES_COLUMN_VALUE ){
+      if( pConstraint->iColumn==SERIES_COLUMN_VALUE && pConstraint->usable ){
         switch( op ){
           case SQLITE_INDEX_CONSTRAINT_EQ:
           case SQLITE_INDEX_CONSTRAINT_IS: {
             idxNum |=  0x0080;
             idxNum &= ~0x3300;
             aIdx[5] = i;
             aIdx[6] = -1;
+#ifndef ZERO_ARGUMENT_GENERATE_SERIES
             bStartSeen = 1;
+#endif
             break;
           }
           case SQLITE_INDEX_CONSTRAINT_GE: {
             if( idxNum & 0x0080 ) break;
             idxNum |=  0x0100;
             idxNum &= ~0x0200;
             aIdx[5] = i;
+#ifndef ZERO_ARGUMENT_GENERATE_SERIES
             bStartSeen = 1;
+#endif
             break;
           }
           case SQLITE_INDEX_CONSTRAINT_GT: {
             if( idxNum & 0x0080 ) break;
             idxNum |=  0x0200;
             idxNum &= ~0x0100;
             aIdx[5] = i;
+#ifndef ZERO_ARGUMENT_GENERATE_SERIES
             bStartSeen = 1;
+#endif
             break;
           }
           case SQLITE_INDEX_CONSTRAINT_LE: {
@@ -751,7 +757,7 @@ static int seriesBestIndex(
     return SQLITE_CONSTRAINT;
   }
   if( (idxNum & 0x03)==0x03 ){
-    /* Both start= and stop= boundaries are available.  This is the
+    /* Both start= and stop= boundaries are available.  This is the 
     ** the preferred case */
     pIdxInfo->estimatedCost = (double)(2 - ((idxNum&4)!=0));
     pIdxInfo->estimatedRows = 1000;
@@ -780,7 +786,7 @@ static int seriesBestIndex(
 }
 
 /*
-** This following structure defines all the methods for the
+** This following structure defines all the methods for the 
 ** generate_series virtual table.
 */
 static sqlite3_module seriesModule = {
@@ -817,8 +823,8 @@ static sqlite3_module seriesModule = {
 __declspec(dllexport)
 #endif
 int sqlite3_series_init(
-  sqlite3 *db,
-  char **pzErrMsg,
+  sqlite3 *db, 
+  char **pzErrMsg, 
   const sqlite3_api_routines *pApi
 ){
   int rc = SQLITE_OK;