wxSQLite3 updated to 3.2.0

(sqlite3 updated to 3.8.7.4)

Author: rindeal

VERSIONS

@@ -1,3 +1,3 @@
-wxsqlite=3.1.1
-sqlite=3.8.5
+wxsqlite=3.2.0
+sqlite=3.8.7.4
 premake=4.4-beta5

src/codec.c

@@ -39,10 +39,12 @@
 
 #include "codec.h"
 
+#ifndef SQLITE_USER_AUTHENTICATION
 #if CODEC_TYPE == CODEC_TYPE_AES256
 #include "sha2.h"
 #include "sha2.c"
 #endif
+#endif
 
 /*
 // ----------------
@@ -702,47 +704,67 @@ CodecGenerateEncryptionKey(Codec* codec, char* userPassword, int passwordLength,
 void
 CodecEncrypt(Codec* codec, int page, unsigned char* data, int len, int useWriteKey)
 {
+#ifdef WXSQLITE3_USE_OLD_ENCRYPTION_SCHEME
+  /* Use the previous encryption scheme */
+  unsigned char* key = (useWriteKey) ? codec->m_writeKey : codec->m_readKey;
+  CodecAES(codec, page, 1, key, data, len, data);
+#else
   unsigned char dbHeader[8];
   int offset = 0;
   unsigned char* key = (useWriteKey) ? codec->m_writeKey : codec->m_readKey;
   if (page == 1)
   {
+    /* Save the header bytes remaining unencrypted */
     memcpy(dbHeader, data+16, 8);
     offset = 16;
     CodecAES(codec, page, 1, key, data, 16, data);
   }
   CodecAES(codec, page, 1, key, data+offset, len-offset, data+offset);
   if (page == 1)
   {
+    /* Move the encrypted header bytes 16..23 to a safe position */
     memcpy(data+8,  data+16,  8);
+	/* Restore the unencrypted header bytes 16..23 */
     memcpy(data+16, dbHeader, 8);
   }
+#endif
 }
 
 void
 CodecDecrypt(Codec* codec, int page, unsigned char* data, int len)
 {
+#ifdef WXSQLITE3_USE_OLD_ENCRYPTION_SCHEME
+  /* Use the previous encryption scheme */
+  CodecAES(codec, page, 0, codec->m_readKey, data, len, data);
+#else
   unsigned char dbHeader[8];
   int dbPageSize;
   int offset = 0;
   if (page == 1)
   {
+    /* Save (unencrypted) header bytes 16..23 */
     memcpy(dbHeader, data+16, 8);
+	/* Determine page size */
     dbPageSize = (dbHeader[0] << 8) | (dbHeader[1] << 16);
+	/* Check whether the database header is valid */
+	/* If yes, the database follows the new encryption scheme, otherwise use the previous encryption scheme */
     if ((dbPageSize >= 512)   && (dbPageSize <= SQLITE_MAX_PAGE_SIZE) && (((dbPageSize-1) & dbPageSize) == 0) &&
         (dbHeader[5] == 0x40) && (dbHeader[6] == 0x20) && (dbHeader[7] == 0x20))
     {
+	  /* Restore encrypted bytes 16..23 for new encryption scheme */
       memcpy(data+16, data+8, 8);
       offset = 16;
     }
   }
   CodecAES(codec, page, 0, codec->m_readKey, data+offset, len-offset, data+offset);
   if (page == 1 && offset != 0)
   {
+    /* Verify the database header */
     if (memcmp(dbHeader, data+16, 8) == 0)
     {
       memcpy(data, SQLITE_FILE_HEADER, 16);
     }
   }
+#endif
 }
 

src/codecext.c

@@ -338,7 +338,11 @@ int sqlite3_rekey_v2(sqlite3 *db, const char *zDbName, const void *zKey, int nKe
   if (rc != SQLITE_OK)
   {
     /* Rollback in case of error */
-#if (SQLITE_VERSION_NUMBER >= 3007011)
+#if (SQLITE_VERSION_NUMBER >= 3008007)
+    /* Unfortunately this change was introduced in version 3.8.7.2 which cannot be detected using the SQLITE_VERSION_NUMBER */
+    /* That is, compilation will fail for version 3.8.7 or 3.8.7.1  ==> Please change manually ... or upgrade to 3.8.7.2 or higher */
+    sqlite3BtreeRollback(pbt, SQLITE_OK, 0);
+#elif (SQLITE_VERSION_NUMBER >= 3007011)
     sqlite3BtreeRollback(pbt, SQLITE_OK);
 #else
     sqlite3BtreeRollback(pbt);