Prepare release of version 1.3.1

Prevent rekeying in WAL journal mode (could cause database corruption)
Add some error messages (key, rekey, pragma handling)

Author: utelle

configure.ac

@@ -4,7 +4,7 @@ dnl Copyright (C) 2019-2021 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.3.0], [[email protected]])
+AC_INIT([sqlite3mc], [1.3.1], [[email protected]])
 
 dnl This is the version tested with, might work with earlier ones.
 AC_PREREQ([2.69])

readme.md

@@ -12,6 +12,9 @@ The code was mainly developed under Windows, but was tested under Linux as well.
 
 ## Version history
 
+* 1.3.1 - *April 2021*
+  - Prevent rekey in WAL journal mode
+  - Fix issue in user authentication extension that prevented VACUUMing or rekeying
 * 1.3.0 - *April 2021*
   - Based on SQLite version 3.35.5
   - Fix issue #37: Allow concurrent access from legacy applications by establishing WAL journal mode compatibility

src/cipher_config.c

@@ -3,7 +3,7 @@
 ** 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
 */
 
@@ -809,6 +809,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
     {

src/codecext.c

@@ -3,7 +3,7 @@
 ** 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
 */
 
@@ -346,6 +346,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;
@@ -372,6 +373,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;
@@ -384,6 +386,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	*/
@@ -431,6 +439,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;
       }
     }
@@ -479,12 +488,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;
     }
   }

src/sqlite3mc_version.h

@@ -14,8 +14,8 @@
 
 #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_ */