Prepare release of wxSQLite3 4.7.0

Upgrade to SQLite3 Multiple Ciphers version 1.3.0 (SQLite version 3.35.5)

Author: utelle

configure.ac

@@ -4,7 +4,7 @@ dnl Copyright (C) 2017-2021 Ulrich Telle <ulrich@telle-online.de>, Vadim Zeitlin
 dnl
 dnl This file is covered by the same licence as the entire wxSQLite3 package.
 
-AC_INIT([wxsqlite3], [4.6.10], [ulrich@telle-online.de])
+AC_INIT([wxsqlite3], [4.7.0], [ulrich@telle-online.de])
 
 dnl This is the version tested with, might work with earlier ones.
 AC_PREREQ([2.69])

docs/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = wxSQLite3
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.6.10
+PROJECT_NUMBER         = 4.7.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

include/wx/wxsqlite3_version.h

@@ -13,9 +13,9 @@
 #define WXSQLITE3_VERSION_H_
 
 #define WXSQLITE3_MAJOR_VERSION      4
-#define WXSQLITE3_MINOR_VERSION      6
-#define WXSQLITE3_RELEASE_NUMBER     10
+#define WXSQLITE3_MINOR_VERSION      7
+#define WXSQLITE3_RELEASE_NUMBER     0
 #define WXSQLITE3_SUBRELEASE_NUMBER  0
-#define WXSQLITE3_VERSION_STRING     "wxSQLite3 4.6.10"
+#define WXSQLITE3_VERSION_STRING     "wxSQLite3 4.7.0"
 
 #endif // WXSQLITE3_VERSION_H_

include/wx/wxsqlite3def.h

@@ -46,6 +46,11 @@
 
 <dl>
 
+<dt><b>4.7.0</b> - <i>April 2021</i></dt>
+<dd>
+Upgrade to <i>SQLite3 Multiple Ciphers version 1.3.0 (SQLite version 3.35.5)</i><br>
+
+</dd>
 <dt><b>4.6.10</b> - <i>April 2021</i></dt>
 <dd>
 Upgrade to <i>SQLite3 Multiple Ciphers version 1.2.5 (SQLite version 3.35.5)</i><br>

readme.md

@@ -48,6 +48,8 @@ Since August 2020 a new implementation of an encryption extension, capable of su
 
 ## <a name="history"></a>Version history
 
+* 4.7.0 - *April 2021*
+  - Upgrade to SQLite3 Multiple Ciphers version 1.3.0 (SQLite version 3.35.5)
 * 4.6.10 - *April 2021*
   - Upgrade to SQLite3 Multiple Ciphers version 1.2.5 (SQLite version 3.35.5)
 * 4.6.9 - *April 2021*

src/sqlite3mc_amalgamation.c

@@ -3,7 +3,7 @@
 ** Purpose:     Amalgamation of the SQLite3 Multiple Ciphers encryption extension for SQLite
 ** Author:      Ulrich Telle
 ** Created:     2020-02-28
-** Copyright:   (c) 2006-2020 Ulrich Telle
+** Copyright:   (c) 2006-2021 Ulrich Telle
 ** License:     MIT
 */
 
@@ -50,16 +50,32 @@ void sqlite3mc_shutdown(void);
 #endif
 
 #if defined(_WIN32) || defined(WIN32)
+
+#ifndef SQLITE3MC_USE_RAND_S
+#define SQLITE3MC_USE_RAND_S 1
+#endif
+
+#if SQLITE3MC_USE_RAND_S
+/* Force header stdlib.h to define rand_s() */
+#if !defined(_CRT_RAND_S)
+#define _CRT_RAND_S
+#endif
+#endif
+
+#ifndef SQLITE_API
+#define SQLITE_API
+#endif
+
 #include <windows.h>
 
 /* SQLite functions only needed on Win32 */
-extern void sqlite3_win32_write_debug(const char*, int);
-extern char *sqlite3_win32_unicode_to_utf8(LPCWSTR);
-extern char *sqlite3_win32_mbcs_to_utf8(const char*);
-extern char *sqlite3_win32_mbcs_to_utf8_v2(const char*, int);
-extern char *sqlite3_win32_utf8_to_mbcs(const char*);
-extern char *sqlite3_win32_utf8_to_mbcs_v2(const char*, int);
-extern LPWSTR sqlite3_win32_utf8_to_unicode(const char*);
+extern SQLITE_API void sqlite3_win32_write_debug(const char*, int);
+extern SQLITE_API char *sqlite3_win32_unicode_to_utf8(LPCWSTR);
+extern SQLITE_API char *sqlite3_win32_mbcs_to_utf8(const char*);
+extern SQLITE_API char *sqlite3_win32_mbcs_to_utf8_v2(const char*, int);
+extern SQLITE_API char *sqlite3_win32_utf8_to_mbcs(const char*);
+extern SQLITE_API char *sqlite3_win32_utf8_to_mbcs_v2(const char*, int);
+extern SQLITE_API LPWSTR sqlite3_win32_utf8_to_unicode(const char*);
 #endif
 
 /*
@@ -11027,6 +11043,8 @@ SQLITE_API int sqlite3_deserialize(
 SQLITE_PRIVATE int sqlite3mcFileControlPragma(sqlite3*, const char*, int, void*);
 SQLITE_PRIVATE int sqlite3mcHandleAttachKey(sqlite3*, const char*, const char*, sqlite3_value*, char**);
 SQLITE_PRIVATE int sqlite3mcHandleMainKey(sqlite3*, const char*);
+typedef struct PgHdr PgHdr;
+SQLITE_PRIVATE void* sqlite3mcPagerCodec(PgHdr* pPg);
 
 /******** Begin file sqlite3rtree.h *********/
 /*
@@ -63362,7 +63380,7 @@ static int walWriteOneFrame(
   int rc;                         /* Result code from subfunctions */
   void *pData;                    /* Data actually written */
   u8 aFrame[WAL_FRAME_HDRSIZE];   /* Buffer to assemble frame-header in */
-  pData = pPage->pData;
+  if( (pData = sqlite3mcPagerCodec(pPage))==0 ) return SQLITE_NOMEM_BKPT;
   walEncodeFrame(p->pWal, pPage->pgno, nTruncate, pData, aFrame);
   rc = walWriteToLog(p, aFrame, sizeof(aFrame), iOffset);
   if( rc ) return rc;
@@ -63545,7 +63563,7 @@ SQLITE_PRIVATE int sqlite3WalFrames(
         if( pWal->iReCksum==0 || iWrite<pWal->iReCksum ){
           pWal->iReCksum = iWrite;
         }
-        pData = p->pData;
+        if( (pData = sqlite3mcPagerCodec(p))==0 ) return SQLITE_NOMEM;
         rc = sqlite3OsWrite(pWal->pWalFd, pData, szPage, iOff);
         if( rc ) return rc;
         p->flags &= ~PGHDR_WAL_APPEND;
@@ -246921,10 +246939,10 @@ SQLITE_API void sqlite3mc_vfs_shutdown();
 #define SQLITE3MC_VERSION_H_
 
 #define SQLITE3MC_VERSION_MAJOR      1
-#define SQLITE3MC_VERSION_MINOR      2
-#define SQLITE3MC_VERSION_RELEASE    5
+#define SQLITE3MC_VERSION_MINOR      3
+#define SQLITE3MC_VERSION_RELEASE    0
 #define SQLITE3MC_VERSION_SUBRELEASE 0
-#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 1.2.5"
+#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 1.3.0"
 
 #endif /* SQLITE3MC_VERSION_H_ */
 /*** End of #include "sqlite3mc_version.h" ***/
@@ -249559,6 +249577,48 @@ int poly1305_tagcmp(const uint8_t tag1[16], const uint8_t tag2[16])
  * Platform-specific entropy functions for seeding RNG
  */
 #if defined(_WIN32) || defined(__CYGWIN__)
+
+#if SQLITE3MC_USE_RAND_S
+
+/* Force header stdlib.h to define rand_s() */
+#if !defined(_CRT_RAND_S)
+#define _CRT_RAND_S
+#endif
+#include <stdlib.h>
+
+/*
+  Provide declaration of rand_s() for MinGW-32 (not 64).
+  MinGW-32 didn't declare it prior to version 5.3.0.
+*/
+#if defined(__MINGW32__) && defined(__MINGW32_VERSION) && __MINGW32_VERSION < 5003000L && !defined(__MINGW64_VERSION_MAJOR)
+__declspec(dllimport) int rand_s(unsigned int *);
+#endif
+
+static size_t entropy(void* buf, size_t n)
+{
+  size_t totalBytes = 0;
+  while (totalBytes < n)
+  {
+    unsigned int random32 = 0;
+    size_t j = 0;
+
+    if (rand_s(&random32))
+    {
+      /* rand_s failed */
+      return 0;
+    }
+
+    for (; (j < sizeof(random32)) && (totalBytes < n); j++, totalBytes++)
+    {
+      const uint8_t random8 = (uint8_t)(random32 >> (j * 8));
+      ((uint8_t*) buf)[totalBytes] = random8;
+    }
+  }
+  return n;
+}
+
+#else
+  
 #include <windows.h>
 #define RtlGenRandom SystemFunction036
 BOOLEAN NTAPI RtlGenRandom(PVOID RandomBuffer, ULONG RandomBufferLength);
@@ -249567,7 +249627,11 @@ static size_t entropy(void* buf, size_t n)
 {
   return RtlGenRandom(buf, (ULONG) n) ? n : 0;
 }
+
+#endif
+
 #elif defined(__linux__) || defined(__unix__) || defined(__APPLE__)
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
@@ -250497,7 +250561,7 @@ static int
 aesHardwareCheck()
 {
   unsigned int CPUInfo[4];
-  __cpuid(CPUInfo, 1);
+  __cpuid((int*) CPUInfo, 1);
   return (CPUInfo[2] & (1 << 25)) != 0 && (CPUInfo[2] & (1 << 19)) != 0; /* Check AES and SSE4.1 */
 }
 
@@ -256488,7 +256552,6 @@ sqlite3mcFileControlPragma(sqlite3* db, const char* zDbName, int op, void* pArg)
       if (cipherParams != NULL)
       {
         const char* cipherName = globalCodecParameterTable[j].m_name;
-        int j;
         for (j = 0; strlen(cipherParams[j].m_name) > 0; ++j)
         {
           if (sqlite3_stricmp(pragmaName, cipherParams[j].m_name) == 0) break;
@@ -257001,6 +257064,11 @@ mcReportCodecError(BtShared* pBt, int error)
   pBt->pPager->errCode = error;
   setGetterMethod(pBt->pPager);
   pBt->db->errCode = error;
+  if (error == SQLITE_OK)
+  {
+    /* Clear cache to force reread of database after a new passphrase has been set */
+    sqlite3PagerClearCache(pBt->pPager);
+  }
 }
 
 /*
@@ -257088,7 +257156,7 @@ mcAdjustBtree(Btree* pBt, int nPageSize, int nReserved, int isLegacy)
   }
 
   /* Adjust the page size and the reserved area */
-  if (pager->nReserve != nReserved)
+  if (pager->pageSize != pagesize || pager->nReserve != nReserved)
   {
     if (isLegacy != 0)
     {
@@ -267537,6 +267605,37 @@ SQLITE_PRIVATE void sqlite3mcSetCodec(sqlite3* db, const char* zFileName, Codec*
   }
 }
 
+/*
+** This function is called by the wal module when writing page content
+** into the log file.
+**
+** This function returns a pointer to a buffer containing the encrypted
+** page content. If a malloc fails, this function may return NULL.
+*/
+SQLITE_PRIVATE void* sqlite3mcPagerCodec(PgHdr* pPg)
+{
+  sqlite3_file* pFile = sqlite3PagerFile(pPg->pPager);
+  void* aData = 0;
+  if (pFile->pMethods == &mcIoMethodsGlobal)
+  {
+    sqlite3mc_file* mcFile = (sqlite3mc_file*) pFile;
+    Codec* codec = (mcFile->pMainDb) ? mcFile->pMainDb->codec : 0;
+    if (codec != 0 && sqlite3mcIsEncrypted(codec))
+    {
+      aData = sqlite3mcCodec(codec, pPg->pData, pPg->pgno, 6);
+    }
+    else
+    {
+      aData = (char*) pPg->pData;
+    }
+  }
+  else
+  {
+    aData = (char*) pPg->pData;
+  }
+  return aData;
+}
+
 /*
 ** Implementation of VFS methods
 */
@@ -268254,10 +268353,17 @@ static int mcIoWrite(sqlite3_file* pFile, const void* buffer, int count, sqlite3
     */
   }
 #endif
+#if 0
+  /*
+  ** The page content is encrypted in memory in the WAL journal handler.
+  ** This provides for compatibility with legacy applications using the
+  ** previous SQLITE_HAS_CODEC encryption API.
+  */
   else if (mcFile->openFlags & SQLITE_OPEN_WAL)
   {
     rc = mcWriteWal(pFile, buffer, count, offset);
   }
+#endif
   else
   {
     rc = REALFILE(pFile)->pMethods->xWrite(REALFILE(pFile), buffer, count, offset);