ensure that pragmas don't do anything unless a context is initialized on the db

sjlombardo · sjlombardo · commit cdfd2a3d3aa4 · 2012-01-18T00:15:01.000-05:00
diff --git a/src/crypto.c b/src/crypto.c
@@ -45,7 +45,7 @@ int codec_set_kdf_iter(sqlite3* db, int nDb, int kdf_iter, int for_ctx) {
   if(pDb->pBt) {
     codec_ctx *ctx;
     sqlite3pager_get_codec(pDb->pBt->pBt->pPager, (void **) &ctx);
-    return sqlcipher_codec_ctx_set_kdf_iter(ctx, kdf_iter, for_ctx);
+    if(ctx) return sqlcipher_codec_ctx_set_kdf_iter(ctx, kdf_iter, for_ctx);
   }
   return SQLITE_ERROR;
 }
@@ -57,7 +57,7 @@ int codec_set_fast_kdf_iter(sqlite3* db, int nDb, int kdf_iter, int for_ctx) {
   if(pDb->pBt) {
     codec_ctx *ctx;
     sqlite3pager_get_codec(pDb->pBt->pBt->pPager, (void **) &ctx);
-    return sqlcipher_codec_ctx_set_fast_kdf_iter(ctx, kdf_iter, for_ctx);
+    if(ctx) return sqlcipher_codec_ctx_set_fast_kdf_iter(ctx, kdf_iter, for_ctx);
   }
   return SQLITE_ERROR;
 }
@@ -86,14 +86,14 @@ int codec_set_use_hmac(sqlite3* db, int nDb, int use) {
     int rc;
     codec_ctx *ctx;
     sqlite3pager_get_codec(pDb->pBt->pBt->pPager, (void **) &ctx);
-
-    rc = sqlcipher_codec_ctx_set_use_hmac(ctx, use);
-    if(rc != SQLITE_OK) return rc;
-
-    /* since the use of hmac has changed, the page size may also change */
-    /* Note: before forcing the page size we need to force pageSizeFixed to 0, else  
+    if(ctx) {
+      rc = sqlcipher_codec_ctx_set_use_hmac(ctx, use);
+      if(rc != SQLITE_OK) return rc;
+      /* since the use of hmac has changed, the page size may also change */
+      /* Note: before forcing the page size we need to force pageSizeFixed to 0, else  
              sqliteBtreeSetPageSize will block the change  */
-    return codec_set_btree_to_codec_pagesize(db, pDb, ctx);
+      return codec_set_btree_to_codec_pagesize(db, pDb, ctx);
+    }
   }
   return SQLITE_ERROR;
 }
@@ -107,10 +107,11 @@ int codec_set_page_size(sqlite3* db, int nDb, int size) {
     codec_ctx *ctx;
     sqlite3pager_get_codec(pDb->pBt->pBt->pPager, (void **) &ctx);
 
-    rc = sqlcipher_codec_ctx_set_pagesize(ctx, size);
-    if(rc != SQLITE_OK) return rc;
-
-    return codec_set_btree_to_codec_pagesize(db, pDb, ctx);
+    if(ctx) {
+      rc = sqlcipher_codec_ctx_set_pagesize(ctx, size);
+      if(rc != SQLITE_OK) return rc;
+      return codec_set_btree_to_codec_pagesize(db, pDb, ctx);
+    }
   }
   return SQLITE_ERROR;
 }
@@ -128,7 +129,7 @@ int codec_set_cipher_name(sqlite3* db, int nDb, const char *cipher_name, int for
   if(pDb->pBt) {
     codec_ctx *ctx;
     sqlite3pager_get_codec(pDb->pBt->pBt->pPager, (void **) &ctx);
-    return sqlcipher_codec_ctx_set_cipher(ctx, cipher_name, for_ctx);
+    if(ctx) return sqlcipher_codec_ctx_set_cipher(ctx, cipher_name, for_ctx);
   }
   return SQLITE_ERROR;
 }
@@ -139,7 +140,7 @@ int codec_set_pass_key(sqlite3* db, int nDb, const void *zKey, int nKey, int for
   if(pDb->pBt) {
     codec_ctx *ctx;
     sqlite3pager_get_codec(pDb->pBt->pBt->pPager, (void **) &ctx);
-    return sqlcipher_codec_ctx_set_pass(ctx, zKey, nKey, for_ctx);
+    if(ctx) return sqlcipher_codec_ctx_set_pass(ctx, zKey, nKey, for_ctx);
   }
   return SQLITE_ERROR;
 } 
diff --git a/test/crypto.test b/test/crypto.test
@@ -1115,5 +1115,34 @@ do_test vacuum {
 
 } {10000 true 5000}
 db close
+file delete -force test.db
+
+# test kdf_iter and other pragmas 
+# before a key is set. Verify that they
+# are no-ops
+do_test cipher-options-before-keys {
+  sqlite_orig db test.db
+
+  execsql {
+    PRAGMA kdf_iter = 1000;
+    PRAGMA cipher_page_size = 4096;
+    PRAGMA cipher = 'aes-128-cbc';
+    PRAGMA cipher_use_hmac = OFF;
+    PRAGMA key = 'testkey';
+    CREATE table t1(a,b);
+    INSERT INTO t1 VALUES(1,2);
+  }
+  db close
+
+  sqlite_orig db test.db
+
+  execsql {
+    PRAGMA key = 'testkey';
+    SELECT count(*) FROM t1;
+  }
+
+} {1}
+db close
+file delete -force test.db
 
 finish_test
