Prepare release of wxSQLite3 4.7.1

Upgrade to SQLite3 Multiple Ciphers version 1.3.1 (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.7.0], [ulrich@telle-online.de])
+AC_INIT([wxsqlite3], [4.7.1], [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.7.0
+PROJECT_NUMBER         = 4.7.1
 
 # 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

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.1 - *April 2021*
+  - Upgrade to SQLite3 Multiple Ciphers version 1.3.1 (SQLite version 3.35.5)
 * 4.7.0 - *April 2021*
   - Upgrade to SQLite3 Multiple Ciphers version 1.3.0 (SQLite version 3.35.5)
 * 4.6.10 - *April 2021*

src/sqlite3mc_amalgamation.c

@@ -246940,9 +246940,9 @@ SQLITE_API void sqlite3mc_vfs_shutdown();
 
 #define SQLITE3MC_VERSION_MAJOR      1
 #define SQLITE3MC_VERSION_MINOR      3
-#define SQLITE3MC_VERSION_RELEASE    0
+#define SQLITE3MC_VERSION_RELEASE    1
 #define SQLITE3MC_VERSION_SUBRELEASE 0
-#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 1.3.0"
+#define SQLITE3MC_VERSION_STRING     "SQLite3 Multiple Ciphers 1.3.1"
 
 #endif /* SQLITE3MC_VERSION_H_ */
 /*** End of #include "sqlite3mc_version.h" ***/
@@ -249872,7 +249872,7 @@ static int userAuthCheckLogin(
   int rc;
 
   *peAuth = UAUTH_Unknown;
-  if( !userTableExists(db, "main") ){
+  if( !userTableExists(db, zDb) ){
     *peAuth = UAUTH_Admin;  /* No sqlite_user table.  Everybody is admin. */
     return SQLITE_OK;
   }
@@ -255689,7 +255689,7 @@ sqlite3mcConfigureSQLCipherVersion(sqlite3* db, int configDefault, int legacyVer
 ** Purpose:     Configuration of SQLite codecs
 ** Author:      Ulrich Telle
 ** Created:     2020-03-02
-** Copyright:   (c) 2006-2020 Ulrich Telle
+** Copyright:   (c) 2006-2021 Ulrich Telle
 ** License:     MIT
 */
 
@@ -256530,6 +256530,17 @@ sqlite3mcFileControlPragma(sqlite3* db, const char* zDbName, int op, void* pArg)
       {
         ((char**)pArg)[0] = sqlite3_mprintf("ok");
       }
+      else
+      {
+        if (db->pErr)
+        {
+          const char* z = sqlite3_value_text(db->pErr);
+          if (z && sqlite3Strlen30(z) > 0)
+          {
+            ((char**)pArg)[0] = sqlite3_mprintf(z);
+          }
+        }
+      }
     }
     else
     {
@@ -256679,7 +256690,7 @@ sqlite3mcHandleMainKey(sqlite3* db, const char* zPath)
 ** Purpose:     Implementation of SQLite codec API
 ** Author:      Ulrich Telle
 ** Created:     2006-12-06
-** Copyright:   (c) 2006-2020 Ulrich Telle
+** Copyright:   (c) 2006-2021 Ulrich Telle
 ** License:     MIT
 */
 
@@ -257324,6 +257335,7 @@ sqlite3_key_v2(sqlite3* db, const char* zDbName, const void* zKey, int nKey)
     else
     {
       rc = SQLITE_ERROR;
+      sqlite3ErrorWithMsg(db, rc, "Key failed. Database '%s' not found.", zDbName);
     }
   }
   return rc;
@@ -257350,6 +257362,7 @@ sqlite3_rekey_v2(sqlite3* db, const char* zDbName, const void* zKey, int nKey)
   dbIndex = (zDbName) ? sqlite3FindDbName(db, zDbName) : 0;
   if (dbIndex < 0)
   {
+    sqlite3ErrorWithMsg(db, rc, "Rekey failed. Database '%s' not found.", zDbName);
     return rc;
   }
   pBt = db->aDb[dbIndex].pBt;
@@ -257362,6 +257375,12 @@ sqlite3_rekey_v2(sqlite3* db, const char* zDbName, const void* zKey, int nKey)
   pPager = sqlite3BtreePager(pBt);
   codec = sqlite3mcGetCodec(db, zDbName);
 
+  if (pagerUseWal(pPager))
+  {
+    sqlite3ErrorWithMsg(db, rc, "Rekey is not supported in WAL journal mode.");
+    return rc;
+  }
+  
   if ((zKey == NULL || nKey == 0) && (codec == NULL || !sqlite3mcIsEncrypted(codec)))
   {
     /* Database not encrypted and key not specified, therefore do nothing	*/
@@ -257409,6 +257428,7 @@ sqlite3_rekey_v2(sqlite3* db, const char* zDbName, const void* zKey, int nKey)
       {
         /* Pagesize cannot be changed for an encrypted database */
         rc = SQLITE_ERROR;
+        sqlite3ErrorWithMsg(db, rc, "Rekey failed. Pagesize cannot be changed for an encrypted database.");
         goto leave_rekey;
       }
     }
@@ -257457,12 +257477,14 @@ sqlite3_rekey_v2(sqlite3* db, const char* zDbName, const void* zKey, int nKey)
       {
         /* Pagesize cannot be changed for an encrypted database */
         rc = SQLITE_ERROR;
+        sqlite3ErrorWithMsg(db, rc, "Rekey failed. Pagesize cannot be changed for an encrypted database.");
         goto leave_rekey;
       }
     }
     else
     {
       /* Setup of write cipher failed */
+      sqlite3ErrorWithMsg(db, rc, "Rekey failed. Setup of write cipher failed.");
       goto leave_rekey;
     }
   }