better-sqlite3-multiple-ciphers 12.9.0 → 12.10.0

package/README.md

@@ -17,10 +17,10 @@ The fastest and simplest library for SQLite in Node.js. This particular fork sup
 ## Current versions
 
 - ### Stable
-  - **better-sqlite3-multiple-ciphers** - [`12.9.0`](https://github.com/m4heshd/better-sqlite3-multiple-ciphers/releases/tag/v12.9.0)
-  - **better-sqlite3** - [`12.9.0`](https://github.com/JoshuaWise/better-sqlite3/releases/tag/v12.9.0)
-  - **SQLite** - [`3.53.0`](https://www.sqlite.org/releaselog/3_53_0.html)
-  - **SQLite3 Multiple Ciphers** - [`2.3.3`](https://github.com/utelle/SQLite3MultipleCiphers/releases/tag/v2.3.3)
+  - **better-sqlite3-multiple-ciphers** - [`12.10.0`](https://github.com/m4heshd/better-sqlite3-multiple-ciphers/releases/tag/v12.10.0)
+  - **better-sqlite3** - [`12.10.0`](https://github.com/JoshuaWise/better-sqlite3/releases/tag/v12.10.0)
+  - **SQLite** - [`3.53.1`](https://www.sqlite.org/releaselog/3_53_1.html)
+  - **SQLite3 Multiple Ciphers** - [`2.3.4`](https://github.com/utelle/SQLite3MultipleCiphers/releases/tag/v2.3.4)
 
 - ### Beta
   - **better-sqlite3-multiple-ciphers** - [`11.0.0-beta.0`](https://github.com/m4heshd/better-sqlite3-multiple-ciphers/releases/tag/v11.0.0-beta.0)

package/deps/defines.gypi

@@ -1,42 +1,43 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY deps/download.sh (DO NOT EDIT)
-
-{
-  'defines': [
-    'HAVE_INT16_T=1',
-    'HAVE_INT32_T=1',
-    'HAVE_INT8_T=1',
-    'HAVE_STDINT_H=1',
-    'HAVE_UINT16_T=1',
-    'HAVE_UINT32_T=1',
-    'HAVE_UINT8_T=1',
-    'HAVE_USLEEP=1',
-    'SQLITE_DEFAULT_CACHE_SIZE=-16000',
-    'SQLITE_DEFAULT_FOREIGN_KEYS=1',
-    'SQLITE_DEFAULT_MEMSTATUS=0',
-    'SQLITE_DEFAULT_WAL_SYNCHRONOUS=1',
-    'SQLITE_DQS=0',
-    'SQLITE_ENABLE_COLUMN_METADATA',
-    'SQLITE_ENABLE_DBSTAT_VTAB',
-    'SQLITE_ENABLE_DESERIALIZE',
-    'SQLITE_ENABLE_FTS3',
-    'SQLITE_ENABLE_FTS3_PARENTHESIS',
-    'SQLITE_ENABLE_FTS4',
-    'SQLITE_ENABLE_FTS5',
-    'SQLITE_ENABLE_GEOPOLY',
-    'SQLITE_ENABLE_JSON1',
-    'SQLITE_ENABLE_MATH_FUNCTIONS',
-    'SQLITE_ENABLE_RTREE',
-    'SQLITE_ENABLE_STAT4',
-    'SQLITE_ENABLE_UPDATE_DELETE_LIMIT',
-    'SQLITE_LIKE_DOESNT_MATCH_BLOBS',
-    'SQLITE_OMIT_DEPRECATED',
-    'SQLITE_OMIT_PROGRESS_CALLBACK',
-    'SQLITE_OMIT_SHARED_CACHE',
-    'SQLITE_OMIT_TCL_VARIABLE',
-    'SQLITE_SOUNDEX',
-    'SQLITE_THREADSAFE=2',
-    'SQLITE_TRACE_SIZE_LIMIT=32',
-    'SQLITE_USER_AUTHENTICATION=0',
-    'SQLITE_USE_URI=0',
-  ],
-}
+# THIS FILE IS AUTOMATICALLY GENERATED BY deps/download.sh (DO NOT EDIT)
+
+{
+  'defines': [
+    'HAVE_INT16_T=1',
+    'HAVE_INT32_T=1',
+    'HAVE_INT8_T=1',
+    'HAVE_STDINT_H=1',
+    'HAVE_UINT16_T=1',
+    'HAVE_UINT32_T=1',
+    'HAVE_UINT8_T=1',
+    'HAVE_USLEEP=1',
+    'SQLITE_DEFAULT_CACHE_SIZE=-16000',
+    'SQLITE_DEFAULT_FOREIGN_KEYS=1',
+    'SQLITE_DEFAULT_MEMSTATUS=0',
+    'SQLITE_DEFAULT_WAL_SYNCHRONOUS=1',
+    'SQLITE_DQS=0',
+    'SQLITE_ENABLE_COLUMN_METADATA',
+    'SQLITE_ENABLE_DBSTAT_VTAB',
+    'SQLITE_ENABLE_DESERIALIZE',
+    'SQLITE_ENABLE_FTS3',
+    'SQLITE_ENABLE_FTS3_PARENTHESIS',
+    'SQLITE_ENABLE_FTS4',
+    'SQLITE_ENABLE_FTS5',
+    'SQLITE_ENABLE_GEOPOLY',
+    'SQLITE_ENABLE_JSON1',
+    'SQLITE_ENABLE_MATH_FUNCTIONS',
+    'SQLITE_ENABLE_PERCENTILE',
+    'SQLITE_ENABLE_RTREE',
+    'SQLITE_ENABLE_STAT4',
+    'SQLITE_ENABLE_UPDATE_DELETE_LIMIT',
+    'SQLITE_LIKE_DOESNT_MATCH_BLOBS',
+    'SQLITE_OMIT_DEPRECATED',
+    'SQLITE_OMIT_PROGRESS_CALLBACK',
+    'SQLITE_OMIT_SHARED_CACHE',
+    'SQLITE_OMIT_TCL_VARIABLE',
+    'SQLITE_SOUNDEX',
+    'SQLITE_THREADSAFE=2',
+    'SQLITE_TRACE_SIZE_LIMIT=32',
+    'SQLITE_USER_AUTHENTICATION=0',
+    'SQLITE_USE_URI=0',
+  ],
+}

package/deps/sqlite3/sqlite3.c

@@ -123,7 +123,7 @@ SQLITE_API LPWSTR sqlite3_win32_utf8_to_unicode(const char*);
 /*** Begin of #include "sqlite3patched.c" ***/
 /******************************************************************************
 ** This file is an amalgamation of many separate C source files from SQLite
-** version 3.53.0.  By combining all the individual C code files into this
+** version 3.53.1.  By combining all the individual C code files into this
 ** single large file, the entire code can be compiled as a single translation
 ** unit.  This allows many compilers to do optimizations that would not be
 ** possible if the files were compiled separately.  Performance improvements
@@ -141,7 +141,7 @@ SQLITE_API LPWSTR sqlite3_win32_utf8_to_unicode(const char*);
 ** separate file. This file contains only code for the core SQLite library.
 **
 ** The content in this amalgamation comes from Fossil check-in
-** 4525003a53a7fc63ca75c59b22c79608659c with changes in files:
+** c88b22011a54b4f6fbd149e9f8e4de77658c with changes in files:
 **
 **
 */
@@ -591,12 +591,12 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.53.0"
-#define SQLITE_VERSION_NUMBER 3053000
-#define SQLITE_SOURCE_ID      "2026-04-09 11:41:38 4525003a53a7fc63ca75c59b22c79608659ca12f0131f52c18637f829977f20b"
-#define SQLITE_SCM_BRANCH     "trunk"
-#define SQLITE_SCM_TAGS       "release major-release version-3.53.0"
-#define SQLITE_SCM_DATETIME   "2026-04-09T11:41:38.498Z"
+#define SQLITE_VERSION        "3.53.1"
+#define SQLITE_VERSION_NUMBER 3053001
+#define SQLITE_SOURCE_ID      "2026-05-05 10:34:17 c88b22011a54b4f6fbd149e9f8e4de77658ce58143a1af0e3785e4e6475127e9"
+#define SQLITE_SCM_BRANCH     "branch-3.53"
+#define SQLITE_SCM_TAGS       "release version-3.53.1"
+#define SQLITE_SCM_DATETIME   "2026-05-05T10:34:17.344Z"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -32657,7 +32657,7 @@ static char *printfTempBuf(sqlite3_str *pAccum, sqlite3_int64 n){
     sqlite3StrAccumSetError(pAccum, SQLITE_TOOBIG);
     return 0;
   }
-  z = sqlite3DbMallocRaw(pAccum->db, n);
+  z = sqlite3_malloc(n);
   if( z==0 ){
     sqlite3StrAccumSetError(pAccum, SQLITE_NOMEM);
   }
@@ -33115,11 +33115,27 @@ SQLITE_API void sqlite3_str_vappendf(
 
         szBufNeeded = MAX(e2,0)+(i64)precision+(i64)width+10;
         if( cThousand && e2>0 ) szBufNeeded += (e2+2)/3;
-        if( sqlite3StrAccumEnlargeIfNeeded(pAccum, szBufNeeded) ){
-          width = length = 0;
-          break;
+        if( szBufNeeded + pAccum->nChar >= pAccum->nAlloc ){
+          if( pAccum->mxAlloc==0 && pAccum->accError==0 ){
+            /* Unable to allocate space in pAccum, perhaps because it
+            ** is coming from sqlite3_snprintf() or similar.  We'll have
+            ** to render into temporary space and the memcpy() it over. */
+            bufpt = sqlite3_malloc(szBufNeeded);
+            if( bufpt==0 ){
+              sqlite3StrAccumSetError(pAccum, SQLITE_NOMEM);
+              return;
+            }
+            zExtra = bufpt;
+          }else if( sqlite3StrAccumEnlarge(pAccum, szBufNeeded)<szBufNeeded ){
+            width = length = 0;
+            break;
+          }else{
+            bufpt = pAccum->zText + pAccum->nChar;
+          }
+        }else{
+          bufpt = pAccum->zText + pAccum->nChar;
         }
-        bufpt = zOut = pAccum->zText + pAccum->nChar;
+        zOut = bufpt;
 
         flag_dp = (precision>0 ?1:0) | flag_alternateform | flag_altform2;
         /* The sign in front of the number */
@@ -33220,14 +33236,22 @@ SQLITE_API void sqlite3_str_vappendf(
           }
           length = width;
         }
-        pAccum->nChar += length;
-        zOut[length] = 0;
 
-        /* Floating point conversions render directly into the output
-        ** buffer.  Hence, don't just break out of the switch().  Bypass the
-        ** output buffer writing that occurs after the switch() by continuing
-        ** to the next character in the format string. */
-        continue;
+        if( zExtra==0 ){
+          /* The result is being rendered directory into pAccum.  This
+          ** is the command and fast case */
+          pAccum->nChar += length;
+          zOut[length] = 0;
+          continue;
+        }else{
+          /* We were unable to render directly into pAccum because we
+          ** couldn't allocate sufficient memory.  We need to memcpy()
+          ** the rendering (or some prefix thereof) into the output
+          ** buffer. */
+          bufpt[0] = 0;
+          bufpt = zExtra;
+          break;
+        }
       }
       case etSIZE:
         if( !bArgList ){
@@ -33274,7 +33298,7 @@ SQLITE_API void sqlite3_str_vappendf(
             if( sqlite3StrAccumEnlargeIfNeeded(pAccum, nCopyBytes) ){
               break;
             }
-           sqlite3_str_append(pAccum,
+            sqlite3_str_append(pAccum,
                  &pAccum->zText[pAccum->nChar-nCopyBytes], nCopyBytes);
             precision -= nPrior;
             nPrior *= 2;
@@ -33790,7 +33814,7 @@ SQLITE_API void sqlite3_str_reset(StrAccum *p){
 ** of its content, all in one call.
 */
 SQLITE_API void sqlite3_str_free(sqlite3_str *p){
-  if( p ){
+  if( p!=0 && p!=&sqlite3OomStr ){
     sqlite3_str_reset(p);
     sqlite3_free(p);
   }
@@ -36936,15 +36960,20 @@ SQLITE_PRIVATE u8 sqlite3StrIHash(const char *z){
   return h;
 }
 
+#if !defined(SQLITE_DISABLE_INTRINSIC)               \
+  && (defined(__GNUC__) || defined(__clang__))       \
+  && (defined(__x86_64__) || defined(__aarch64__) || \
+      (defined(__riscv) && defined(__riscv_xlen) && (__riscv_xlen>32)))
+#define SQLITE_USE_UINT128
+#endif
+
 /*
 ** Two inputs are multiplied to get a 128-bit result.  Write the
 ** lower 64-bits of the result into *pLo, and return the high-order
 ** 64 bits.
 */
 static u64 sqlite3Multiply128(u64 a, u64 b, u64 *pLo){
-#if (defined(__GNUC__) || defined(__clang__)) \
-        && (defined(__x86_64__) || defined(__aarch64__) || defined(__riscv)) \
-        && !defined(SQLITE_DISABLE_INTRINSIC)
+#if defined(SQLITE_USE_UINT128)
   __uint128_t r = (__uint128_t)a * b;
   *pLo = (u64)r;
   return (u64)(r>>64);
@@ -36978,9 +37007,7 @@ static u64 sqlite3Multiply128(u64 a, u64 b, u64 *pLo){
 ** The lower 64 bits of A*B are discarded.
 */
 static u64 sqlite3Multiply160(u64 a, u32 aLo, u64 b, u32 *pLo){
-#if (defined(__GNUC__) || defined(__clang__)) \
-        && (defined(__x86_64__) || defined(__aarch64__) || defined(__riscv)) \
-        && !defined(SQLITE_DISABLE_INTRINSIC)
+#if defined(SQLITE_USE_UINT128)
   __uint128_t r = (__uint128_t)a * b;
   r += ((__uint128_t)aLo * b) >> 32;
   *pLo = (r>>32)&0xffffffff;
@@ -37018,6 +37045,8 @@ static u64 sqlite3Multiply160(u64 a, u32 aLo, u64 b, u32 *pLo){
 #endif
 }
 
+#undef SQLITE_USE_UINT128
+
 /*
 ** Return a u64 with the N-th bit set.
 */
@@ -56256,10 +56285,10 @@ SQLITE_API int sqlite3_deserialize(
   if( rc ) goto end_deserialize;
   db->init.iDb = (u8)iDb;
   db->init.reopenMemdb = 1;
-  rc = sqlite3_step(pStmt);
+  sqlite3_step(pStmt);
   db->init.reopenMemdb = 0;
-  if( rc!=SQLITE_DONE ){
-    rc = SQLITE_ERROR;
+  rc = sqlite3_finalize(pStmt);
+  if( rc!=SQLITE_OK ){
     goto end_deserialize;
   }
   p = memdbFromDbSchema(db, zSchema);
@@ -56280,7 +56309,6 @@ SQLITE_API int sqlite3_deserialize(
   }
 
 end_deserialize:
-  sqlite3_finalize(pStmt);
   if( pData && (mFlags & SQLITE_DESERIALIZE_FREEONCLOSE)!=0 ){
     sqlite3_free(pData);
   }
@@ -123277,7 +123305,9 @@ SQLITE_PRIVATE void sqlite3AlterDropConstraint(
   if( !pTab ) return;
 
   if( pCons ){
-    zArg = sqlite3MPrintf(db, "%.*Q", pCons->n, pCons->z);
+    char *z = sqlite3NameFromToken(db, pCons);
+    zArg = sqlite3MPrintf(db, "%Q", z);
+    sqlite3DbFree(db, z);
   }else{
     int iCol;
     if( alterFindCol(pParse, pTab, pCol, &iCol) ) return;
@@ -125659,6 +125689,16 @@ static void attachFunc(
     ** from sqlite3_deserialize() to close database db->init.iDb and
     ** reopen it as a MemDB */
     Btree *pNewBt = 0;
+
+    pNew = &db->aDb[db->init.iDb];
+    assert( pNew->pBt!=0 );
+    if( sqlite3BtreeTxnState(pNew->pBt)!=SQLITE_TXN_NONE
+     || sqlite3BtreeIsInBackup(pNew->pBt)
+    ){
+      rc = SQLITE_BUSY;
+      goto attach_error;
+    }
+
     pVfs = sqlite3_vfs_find("memdb");
     if( pVfs==0 ) return;
     rc = sqlite3BtreeOpen(pVfs, "x\0", db, &pNewBt, 0, SQLITE_OPEN_MAIN_DB);
@@ -125668,8 +125708,7 @@ static void attachFunc(
         /* Both the Btree and the new Schema were allocated successfully.
         ** Close the old db and update the aDb[] slot with the new memdb
         ** values.  */
-        pNew = &db->aDb[db->init.iDb];
-        if( ALWAYS(pNew->pBt) ) sqlite3BtreeClose(pNew->pBt);
+        sqlite3BtreeClose(pNew->pBt);
         pNew->pBt = pNewBt;
         pNew->pSchema = pNewSchema;
       }else{
@@ -156217,6 +156256,7 @@ static SQLITE_NOINLINE void existsToJoin(
    && !ExprHasProperty(pWhere, EP_OuterON|EP_InnerON)
    && ALWAYS(p->pSrc!=0)
    && p->pSrc->nSrc<BMS
+   && (p->pLimit==0 || p->pLimit->pRight==0)
   ){
     if( pWhere->op==TK_AND ){
       Expr *pRight = pWhere->pRight;
@@ -156264,7 +156304,6 @@ static SQLITE_NOINLINE void existsToJoin(
           sqlite3TreeViewSelect(0, p, 0);
         }
 #endif
-        existsToJoin(pParse, p, pSubWhere);
       }
     }
   }
@@ -166115,7 +166154,7 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
     ** by this loop in the a[0] slot and all notReady tables in a[1..] slots.
     ** This becomes the SrcList in the recursive call to sqlite3WhereBegin().
     */
-    if( pWInfo->nLevel>1 ){
+    if( pWInfo->nLevel>1 || pTabItem->fg.fromExists ){
       int nNotReady;                 /* The number of notReady tables */
       SrcItem *origSrc;              /* Original list of tables */
       nNotReady = pWInfo->nLevel - iLevel - 1;
@@ -166128,6 +166167,13 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
       for(k=1; k<=nNotReady; k++){
         memcpy(&pOrTab->a[k], &origSrc[pLevel[k].iFrom], sizeof(pOrTab->a[k]));
       }
+
+      /* Clear the fromExists flag on the OR-optimized table entry so that
+      ** the calls to sqlite3WhereEnd() do not code early-exits after the
+      ** first row is visited. The early exit applies to this table's
+      ** overall loop - including the multiple OR branches and any WHERE
+      ** conditions not passed to the sub-loops - not to the sub-loops.  */
+      pOrTab->a[0].fg.fromExists = 0;
     }else{
       pOrTab = pWInfo->pTabList;
     }
@@ -166371,7 +166417,7 @@ SQLITE_PRIVATE Bitmask sqlite3WhereCodeOneLoopStart(
     assert( pLevel->op==OP_Return );
     pLevel->p2 = sqlite3VdbeCurrentAddr(v);
 
-    if( pWInfo->nLevel>1 ){ sqlite3DbFreeNN(db, pOrTab); }
+    if( pWInfo->pTabList!=pOrTab ){ sqlite3DbFreeNN(db, pOrTab); }
     if( !untestedTerms ) disableTerm(pLevel, pTerm);
   }else
 #endif /* SQLITE_OMIT_OR_OPTIMIZATION */
@@ -176296,27 +176342,11 @@ SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){
       }
 #endif /* SQLITE_DISABLE_SKIPAHEAD_DISTINCT */
     }
-    if( pTabList->a[pLevel->iFrom].fg.fromExists
-     && (i==pWInfo->nLevel-1
-           || pTabList->a[pWInfo->a[i+1].iFrom].fg.fromExists==0)
-    ){
-      /* This is an EXISTS-to-JOIN optimization which is either the
-      ** inner-most loop, or the inner-most of a group of nested
-      ** EXISTS-to-JOIN optimization loops.  If this loop sees a successful
-      ** row, it should break out of itself as well as other EXISTS-to-JOIN
-      ** loops in which is is directly nested. */
-      int nOuter = 0; /* Nr of outer EXISTS that this one is nested within */
-      while( nOuter<i ){
-        if( !pTabList->a[pLevel[-nOuter-1].iFrom].fg.fromExists ) break;
-        nOuter++;
-      }
-      testcase( nOuter>0 );
-      sqlite3VdbeAddOp2(v, OP_Goto, 0, pLevel[-nOuter].addrBrk);
-      if( nOuter ){
-        VdbeComment((v, "EXISTS break %d..%d", i-nOuter, i));
-      }else{
-        VdbeComment((v, "EXISTS break %d", i));
-      }
+    if( pTabList->a[pLevel->iFrom].fg.fromExists ){
+      /* This is an EXISTS-to-JOIN optimization loop. If this loop sees a
+      ** successful row, it should break out of itself. */
+      sqlite3VdbeAddOp2(v, OP_Goto, 0, pLevel->addrBrk);
+      VdbeComment((v, "EXISTS break %d", i));
     }
     sqlite3VdbeResolveLabel(v, pLevel->addrCont);
     if( pLevel->op!=OP_Noop ){
@@ -184521,6 +184551,7 @@ static YYACTIONTYPE yy_reduce(
   yymsp[-4].minor.yy454 = sqlite3PExpr(pParse, TK_BETWEEN, yymsp[-4].minor.yy454, 0);
   if( yymsp[-4].minor.yy454 ){
     yymsp[-4].minor.yy454->x.pList = pList;
+    sqlite3ExprSetHeightAndFlags(pParse, yymsp[-4].minor.yy454);
   }else{
     sqlite3ExprListDelete(pParse->db, pList);
   }
@@ -234151,10 +234182,11 @@ static int sessionSerialLen(const u8 *a){
   int n;
   assert( a!=0 );
   e = *a;
-  if( e==0 || e==0xFF ) return 1;
-  if( e==SQLITE_NULL ) return 1;
   if( e==SQLITE_INTEGER || e==SQLITE_FLOAT ) return 9;
-  return sessionVarintGet(&a[1], &n) + 1 + n;
+  if( e==SQLITE_TEXT || e==SQLITE_BLOB ){
+    return sessionVarintGet(&a[1], &n) + 1 + n;
+  }
+  return 1;
 }
 
 /*
@@ -234177,17 +234209,17 @@ static unsigned int sessionChangeHash(
   u8 *a = aRecord;                /* Used to iterate through change record */
 
   for(i=0; i<pTab->nCol; i++){
-    int eType = *a;
     int isPK = pTab->abPK[i];
     if( bPkOnly && isPK==0 ) continue;
 
-    assert( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT
-         || eType==SQLITE_TEXT || eType==SQLITE_BLOB
-         || eType==SQLITE_NULL || eType==0
-    );
-
     if( isPK ){
-      a++;
+      int eType = *a++;
+
+      assert( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT
+           || eType==SQLITE_TEXT || eType==SQLITE_BLOB
+           || eType==SQLITE_NULL || eType==0
+      );
+
       h = sessionHashAppendType(h, eType);
       if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
         h = sessionHashAppendI64(h, sessionGetI64(a));
@@ -237215,9 +237247,11 @@ static int sessionChangesetBufferRecord(
         rc = sessionInputBuffer(pIn, nByte);
       }else if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
         nByte += 8;
+      }else if( eType!=0 && eType!=SQLITE_NULL ){
+        rc = SQLITE_CORRUPT_BKPT;
       }
     }
-    if( (pIn->iNext+nByte)>pIn->nData ){
+    if( rc==SQLITE_OK && (pIn->iNext+nByte)>pIn->nData ){
       rc = SQLITE_CORRUPT_BKPT;
     }
   }
@@ -263422,7 +263456,7 @@ static void fts5SourceIdFunc(
 ){
   assert( nArg==0 );
   UNUSED_PARAM2(nArg, apUnused);
-  sqlite3_result_text(pCtx, "fts5: 2026-04-09 11:41:38 4525003a53a7fc63ca75c59b22c79608659ca12f0131f52c18637f829977f20b", -1, SQLITE_TRANSIENT);
+  sqlite3_result_text(pCtx, "fts5: 2026-05-05 10:34:17 c88b22011a54b4f6fbd149e9f8e4de77658ce58143a1af0e3785e4e6475127e9", -1, SQLITE_TRANSIENT);
 }
 
 /*
@@ -269273,9 +269307,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    3
+#define SQLITE3MC_VERSION_RELEASE    4
 #define SQLITE3MC_VERSION_SUBRELEASE 0
-#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 2.3.3"
+#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 2.3.4"
 
 #endif /* SQLITE3MC_VERSION_H_ */
 /*** End of #include "sqlite3mc_version.h" ***/
@@ -269434,12 +269468,12 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.53.0"
-#define SQLITE_VERSION_NUMBER 3053000
-#define SQLITE_SOURCE_ID      "2026-04-09 11:41:38 4525003a53a7fc63ca75c59b22c79608659ca12f0131f52c18637f829977f20b"
-#define SQLITE_SCM_BRANCH     "trunk"
-#define SQLITE_SCM_TAGS       "release major-release version-3.53.0"
-#define SQLITE_SCM_DATETIME   "2026-04-09T11:41:38.498Z"
+#define SQLITE_VERSION        "3.53.1"
+#define SQLITE_VERSION_NUMBER 3053001
+#define SQLITE_SOURCE_ID      "2026-05-05 10:34:17 c88b22011a54b4f6fbd149e9f8e4de77658ce58143a1af0e3785e4e6475127e9"
+#define SQLITE_SCM_BRANCH     "branch-3.53"
+#define SQLITE_SCM_TAGS       "release version-3.53.1"
+#define SQLITE_SCM_DATETIME   "2026-05-05T10:34:17.344Z"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -332785,6 +332819,7 @@ SQLITE_PRIVATE CipherParams mcChaCha20Params[] =
 #define PAGE_NONCE_LEN_CHACHA20  16
 #define PAGE_TAG_LEN_CHACHA20    16
 #define PAGE_RESERVED_CHACHA20   (PAGE_NONCE_LEN_CHACHA20 + PAGE_TAG_LEN_CHACHA20)
+#define OTK_LEN_CHACHA20         64
 
 typedef struct _chacha20Cipher
 {
@@ -332926,7 +332961,7 @@ EncryptPageChaCha20Cipher(void* cipher, int page, unsigned char* data, int len,
   int usePlaintextHeader = 0;
 
   /* Generate one-time keys */
-  uint8_t otk[64];
+  uint8_t otk[OTK_LEN_CHACHA20];
   uint32_t counter;
   int offset = 0;
 
@@ -332955,10 +332990,10 @@ EncryptPageChaCha20Cipher(void* cipher, int page, unsigned char* data, int len,
   if (nReserved > 0)
   {
     /* Encrypt and authenticate */
-    memset(otk, 0, 64);
+    memset(otk, 0, OTK_LEN_CHACHA20);
     chacha20_rng(data + n, PAGE_NONCE_LEN_CHACHA20);
     counter = LOAD32_LE(data + n + PAGE_NONCE_LEN_CHACHA20 - 4) ^ page;
-    chacha20_xor(otk, 64, chacha20Cipher->m_key, data + n, counter);
+    chacha20_xor(otk, OTK_LEN_CHACHA20, chacha20Cipher->m_key, data + n, counter);
 
     chacha20_xor(data + offset, n - offset, otk + 32, data + n, counter + 1);
     if (page == 1 && usePlaintextHeader == 0)
@@ -332971,10 +333006,10 @@ EncryptPageChaCha20Cipher(void* cipher, int page, unsigned char* data, int len,
   {
     /* Encrypt only */
     uint8_t nonce[PAGE_NONCE_LEN_CHACHA20];
-    memset(otk, 0, 64);
+    memset(otk, 0, OTK_LEN_CHACHA20);
     sqlite3mcGenerateInitialVector(page, nonce);
     counter = LOAD32_LE(&nonce[PAGE_NONCE_LEN_CHACHA20 - 4]) ^ page;
-    chacha20_xor(otk, 64, chacha20Cipher->m_key, nonce, counter);
+    chacha20_xor(otk, OTK_LEN_CHACHA20, chacha20Cipher->m_key, nonce, counter);
 
     /* Encrypt */
     chacha20_xor(data + offset, n - offset, otk + 32, nonce, counter + 1);
@@ -332984,6 +333019,9 @@ EncryptPageChaCha20Cipher(void* cipher, int page, unsigned char* data, int len,
     }
   }
 
+  /* Zero out otk array */
+  sqlite3mcSecureZeroMemory(otk, OTK_LEN_CHACHA20);
+
   return rc;
 }
 
@@ -333011,7 +333049,7 @@ DecryptPageChaCha20Cipher(void* cipher, int page, unsigned char* data, int len,
   int usePlaintextHeader = 0;
 
   /* Generate one-time keys */
-  uint8_t otk[64];
+  uint8_t otk[OTK_LEN_CHACHA20];
   uint32_t counter;
   uint8_t tag[16];
   int offset = 0;
@@ -333042,9 +333080,9 @@ DecryptPageChaCha20Cipher(void* cipher, int page, unsigned char* data, int len,
   {
     int allzero = 0;
     /* Decrypt and verify MAC */
-    memset(otk, 0, 64);
+    memset(otk, 0, OTK_LEN_CHACHA20);
     counter = LOAD32_LE(data + n + PAGE_NONCE_LEN_CHACHA20 - 4) ^ page;
-    chacha20_xor(otk, 64, chacha20Cipher->m_key, data + n, counter);
+    chacha20_xor(otk, OTK_LEN_CHACHA20, chacha20Cipher->m_key, data + n, counter);
 
     /* Determine MAC and decrypt */
     allzero = chacha20_ismemset(data, 0, n);
@@ -333058,7 +333096,7 @@ DecryptPageChaCha20Cipher(void* cipher, int page, unsigned char* data, int len,
       {
         SQLITE3MC_DEBUG_LOG("decrypt: codec=%p page=%d\n", chacha20Cipher, page);
         SQLITE3MC_DEBUG_HEX("decrypt key:", chacha20Cipher->m_key, 32);
-        SQLITE3MC_DEBUG_HEX("decrypt otk:", otk, 64);
+        SQLITE3MC_DEBUG_HEX("decrypt otk:", otk, OTK_LEN_CHACHA20);
         SQLITE3MC_DEBUG_HEX("decrypt data+00:", data, 16);
         SQLITE3MC_DEBUG_HEX("decrypt data+24:", data + 24, 16);
         SQLITE3MC_DEBUG_HEX("decrypt data+n:", data + n, 16);
@@ -333077,10 +333115,10 @@ DecryptPageChaCha20Cipher(void* cipher, int page, unsigned char* data, int len,
   {
     /* Decrypt only */
     uint8_t nonce[PAGE_NONCE_LEN_CHACHA20];
-    memset(otk, 0, 64);
+    memset(otk, 0, OTK_LEN_CHACHA20);
     sqlite3mcGenerateInitialVector(page, nonce);
     counter = LOAD32_LE(&nonce[PAGE_NONCE_LEN_CHACHA20 - 4]) ^ page;
-    chacha20_xor(otk, 64, chacha20Cipher->m_key, nonce, counter);
+    chacha20_xor(otk, OTK_LEN_CHACHA20, chacha20Cipher->m_key, nonce, counter);
 
     /* Decrypt */
     chacha20_xor(data + offset, n - offset, otk + 32, nonce, counter + 1);
@@ -333090,6 +333128,9 @@ DecryptPageChaCha20Cipher(void* cipher, int page, unsigned char* data, int len,
     }
   }
 
+  /* Zero out otk array */
+  sqlite3mcSecureZeroMemory(otk, OTK_LEN_CHACHA20);
+
   return rc;
 }
 
@@ -333255,7 +333296,7 @@ AllocateSQLCipherCipher(sqlite3* db)
     sqlCipherCipher->m_kdfAlgorithm = sqlite3mcGetCipherParameter(cipherParams, "kdf_algorithm");
     sqlCipherCipher->m_hmacAlgorithm = sqlite3mcGetCipherParameter(cipherParams, "hmac_algorithm");
     sqlCipherCipher->m_hmacAlgorithmCompat = sqlite3mcGetCipherParameter(cipherParams, "hmac_algorithm_compat");
-    if (sqlCipherCipher->m_legacy >= SQLCIPHER_VERSION_4)
+    if (sqlCipherCipher->m_legacy == 0 || sqlCipherCipher->m_legacy >= SQLCIPHER_VERSION_4)
     {
       sqlCipherCipher->m_plaintextHeaderSize = sqlite3mcGetCipherParameter(cipherParams, "plaintext_header_size");
     }
@@ -333478,9 +333519,12 @@ EncryptPageSQLCipherCipher(void* cipher, int page, unsigned char* data, int len,
     if (plaintextHeaderSize > 0)
     {
       usePlaintextHeader = 1;
-      if (sqlCipherCipher->m_legacy >= SQLCIPHER_VERSION_4)
+      if (sqlCipherCipher->m_legacy == 0 || sqlCipherCipher->m_legacy >= SQLCIPHER_VERSION_4)
       {
-        offset = plaintextHeaderSize;
+        if (plaintextHeaderSize > offset)
+        {
+          offset = plaintextHeaderSize;
+        }
       }
     }
   }
@@ -333561,9 +333605,12 @@ DecryptPageSQLCipherCipher(void* cipher, int page, unsigned char* data, int len,
     if (plaintextHeaderSize > 0)
     {
       usePlaintextHeader = 1;
-      if (sqlCipherCipher->m_legacy >= SQLCIPHER_VERSION_4)
+      if (sqlCipherCipher->m_legacy == 0 || sqlCipherCipher->m_legacy >= SQLCIPHER_VERSION_4)
       {
-        offset = plaintextHeaderSize;
+        if (plaintextHeaderSize > offset)
+        {
+          offset = plaintextHeaderSize;
+        }
       }
     }
   }
@@ -335285,6 +335332,9 @@ EncryptPageAscon128Cipher(void* cipher, int page, unsigned char* data, int len,
     }
   }
 
+  /* Zero out otk array */
+  sqlite3mcSecureZeroMemory(otk, ASCON_HASH_BYTES);
+
   return rc;
 }
 
@@ -335376,6 +335426,9 @@ DecryptPageAscon128Cipher(void* cipher, int page, unsigned char* data, int len,
     }
   }
 
+  /* Zero out otk array */
+  sqlite3mcSecureZeroMemory(otk, ASCON_HASH_BYTES);
+
   return rc;
 }
 
@@ -335779,6 +335832,9 @@ EncryptPageAegisCipher(void* cipher, int page, unsigned char* data, int len, int
     }
   }
 
+  /* Zero out otk array */
+  sqlite3mcSecureZeroMemory(otk, OTK_LEN_MAX_AEGIS);
+
   return rc;
 }
 
@@ -335879,6 +335935,9 @@ DecryptPageAegisCipher(void* cipher, int page, unsigned char* data, int len, int
     }
   }
 
+  /* Zero out otk array */
+  sqlite3mcSecureZeroMemory(otk, OTK_LEN_MAX_AEGIS);
+
   return rc;
 }
 
@@ -338059,7 +338118,7 @@ sqlite3mcBtreeSetPageSize(Btree* p, int pageSize, int nReserve, int iFix)
 ** 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.53.0 amalgamation.
+** This code is generated by the script rekeyvacuum.sh from SQLite version 3.53.1 amalgamation.
 */
 SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3mcRunVacuumForRekey(
   char **pzErrMsg,        /* Write error message here */

package/deps/sqlite3/sqlite3.h

@@ -31,9 +31,9 @@
 
 #define SQLITE3MC_VERSION_MAJOR      2
 #define SQLITE3MC_VERSION_MINOR      3
-#define SQLITE3MC_VERSION_RELEASE    3
+#define SQLITE3MC_VERSION_RELEASE    4
 #define SQLITE3MC_VERSION_SUBRELEASE 0
-#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 2.3.3"
+#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 2.3.4"
 
 #endif /* SQLITE3MC_VERSION_H_ */
 /*** End of #include "sqlite3mc_version.h" ***/
@@ -192,12 +192,12 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.53.0"
-#define SQLITE_VERSION_NUMBER 3053000
-#define SQLITE_SOURCE_ID      "2026-04-09 11:41:38 4525003a53a7fc63ca75c59b22c79608659ca12f0131f52c18637f829977f20b"
-#define SQLITE_SCM_BRANCH     "trunk"
-#define SQLITE_SCM_TAGS       "release major-release version-3.53.0"
-#define SQLITE_SCM_DATETIME   "2026-04-09T11:41:38.498Z"
+#define SQLITE_VERSION        "3.53.1"
+#define SQLITE_VERSION_NUMBER 3053001
+#define SQLITE_SOURCE_ID      "2026-05-05 10:34:17 c88b22011a54b4f6fbd149e9f8e4de77658ce58143a1af0e3785e4e6475127e9"
+#define SQLITE_SCM_BRANCH     "branch-3.53"
+#define SQLITE_SCM_TAGS       "release version-3.53.1"
+#define SQLITE_SCM_DATETIME   "2026-05-05T10:34:17.344Z"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers

package/deps/update-sqlite3mc.sh

@@ -21,8 +21,8 @@
 # ===
 
 YEAR="2026"
-VERSION="3530000"
-SQLITE3MC_VERSION="v2.3.3"
+VERSION="3530100"
+SQLITE3MC_VERSION="v2.3.4"
 
 # Defines below are sorted alphabetically
 DEFINES="
@@ -49,6 +49,7 @@ SQLITE_ENABLE_FTS5
 SQLITE_ENABLE_GEOPOLY
 SQLITE_ENABLE_JSON1
 SQLITE_ENABLE_MATH_FUNCTIONS
+SQLITE_ENABLE_PERCENTILE
 SQLITE_ENABLE_RTREE
 SQLITE_ENABLE_STAT4
 SQLITE_ENABLE_UPDATE_DELETE_LIMIT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-sqlite3-multiple-ciphers",
-  "version": "12.9.0",
+  "version": "12.10.0",
   "description": "better-sqlite3 with multiple-cipher encryption support",
   "homepage": "https://github.com/m4heshd/better-sqlite3-multiple-ciphers",
   "author": "Mahesh Bandara Wijerathna (m4heshd) <m4heshd@gmail.com>",
@@ -18,7 +18,7 @@
     "deps/**"
   ],
   "engines": {
-    "node": "20.x || 22.x || 23.x || 24.x"
+    "node": "20.x || 22.x || 23.x || 24.x || 25.x || 26.x"
   },
   "dependencies": {
     "bindings": "^1.5.0",
@@ -34,7 +34,7 @@
     "chai": "^4.3.8",
     "cli-color": "^2.0.3",
     "fs-extra": "^11.1.1",
-    "mocha": "^10.2.0",
+    "mocha": "^11.7.5",
     "nodemark": "^0.3.0",
     "prebuild": "^13.0.1",
     "sqlite": "^5.0.1",