Fix issue #18

Multiple calls to sqlite3_key/sqlite3_key_v2 with invalid key values could cause inconsistent error messages; a subsequent call with a valid key failed due to the pager still being in an error state. This has been fixed.

Author: utelle

src/cipher_chacha20.c

@@ -302,7 +302,7 @@ DecryptPageChaCha20Cipher(void* cipher, int page, unsigned char* data, int len,
   /* Check whether number of required reserved bytes and actually reserved bytes match */
   if ((legacy == 0 && nReserved > reserved) || ((legacy != 0 && nReserved != reserved)))
   {
-    return SQLITE_CORRUPT;
+    return (page == 1) ? SQLITE_NOTADB : SQLITE_CORRUPT;
   }
 
   if (nReserved > 0)
@@ -333,7 +333,7 @@ DecryptPageChaCha20Cipher(void* cipher, int page, unsigned char* data, int len,
         SQLITE3MC_DEBUG_HEX("decrypt tag r:", data + n + PAGE_NONCE_LEN_CHACHA20, PAGE_TAG_LEN_CHACHA20);
         SQLITE3MC_DEBUG_HEX("decrypt tag c:", tag, PAGE_TAG_LEN_CHACHA20);
         /* Bad MAC */
-        rc = SQLITE_CORRUPT;
+        rc = (page == 1) ? SQLITE_NOTADB : SQLITE_CORRUPT;
       }
     }
     if (page == 1 && rc == SQLITE_OK)

src/cipher_sqlcipher.c

@@ -442,7 +442,7 @@ DecryptPageSQLCipherCipher(void* cipher, int page, unsigned char* data, int len,
   /* Check whether number of required reserved bytes and actually reserved bytes match */
   if ((legacy == 0 && nReserved > reserved) || ((legacy != 0 && nReserved != reserved)))
   {
-    return SQLITE_CORRUPT;
+    return (page == 1) ? SQLITE_NOTADB : SQLITE_CORRUPT;
   }
 
   /* Get nonce from buffer */
@@ -493,7 +493,7 @@ DecryptPageSQLCipherCipher(void* cipher, int page, unsigned char* data, int len,
   else
   {
     /* Bad MAC */
-    rc = SQLITE_CORRUPT;
+    rc = (page == 1) ? SQLITE_NOTADB : SQLITE_CORRUPT;
   }
 
   return rc;

src/sqlite3mc_vfs.c

@@ -252,6 +252,7 @@ SQLITE_PRIVATE void sqlite3mcSetCodec(sqlite3* db, const char* zFileName, Codec*
       sqlite3mcCodecFree(pDbMain->codec);
     }
     pDbMain->codec = codec;
+    mcReportCodecError(sqlite3mcGetBtShared(codec), SQLITE_OK);
   }
   else
   {