relocate test flag management to crypto_impl.c

sjlombardo · sjlombardo · commit 99d36b40c800 · 2021-10-08T13:02:16.000-04:00
diff --git a/src/crypto.c b/src/crypto.c
@@ -39,11 +39,6 @@
 #include "sqlcipher_ext.h"
 #endif
 
-#ifdef SQLCIPHER_TEST
-static int cipher_test_flags = 0;
-#endif
-
-/* Generate code to return a string value */
 static void codec_vdbe_return_string(Parse *pParse, const char *zLabel, const char *value, int value_type){
   Vdbe *v = sqlite3GetVdbe(pParse);
   sqlite3VdbeSetNumCols(v, 1);
@@ -119,13 +114,13 @@ int sqlcipher_codec_pragma(sqlite3* db, int iDb, Parse *pParse, const char *zLef
   if( sqlite3StrICmp(zLeft,"cipher_test")==0 ){
     if( zRight ) {
       if(sqlite3StrICmp(zRight, "fail_next_encrypt")) {
-        cipher_test_flags ^= TEST_FAIL_NEXT_ENCRYPT;
+        sqlcipher_set_test_flags(sqlcipher_get_test_flags() ^ TEST_FAIL_NEXT_ENCRYPT);
       } else
       if(sqlite3StrICmp(zRight, "fail_next_decrypt")) {
-        cipher_test_flags ^= TEST_FAIL_NEXT_DECRYPT;
+        sqlcipher_set_test_flags(sqlcipher_get_test_flags() ^ TEST_FAIL_NEXT_DECRYPT);
       } 
     } else {
-      char *flags = sqlite3_mprintf("%d", cipher_test_flags);
+      char *flags = sqlite3_mprintf("%d", sqlcipher_get_test_flags());
       codec_vdbe_return_string(pParse, "cipher_test", flags, P4_DYNAMIC);
     }
   }else
@@ -714,7 +709,7 @@ static void* sqlite3Codec(void *iCtx, void *data, Pgno pgno, int mode) {
 
       rc = sqlcipher_page_cipher(ctx, cctx, pgno, CIPHER_DECRYPT, page_sz - offset, pData + offset, (unsigned char*)buffer + offset);
 #ifdef SQLCIPHER_TEST
-      if((cipher_test_flags & TEST_FAIL_NEXT_ENCRYPT) > 0) rc = SQLITE_ERROR;
+      if((sqlcipher_get_test_flags() & TEST_FAIL_NEXT_ENCRYPT) > 0) rc = SQLITE_ERROR;
 #endif
       if(rc != SQLITE_OK) { /* clear results of failed cipher operation and set error */
         sqlcipher_memset((unsigned char*) buffer+offset, 0, page_sz-offset);
@@ -739,7 +734,7 @@ static void* sqlite3Codec(void *iCtx, void *data, Pgno pgno, int mode) {
       }
       rc = sqlcipher_page_cipher(ctx, cctx, pgno, CIPHER_ENCRYPT, page_sz - offset, pData + offset, (unsigned char*)buffer + offset);
 #ifdef SQLCIPHER_TEST
-      if((cipher_test_flags & TEST_FAIL_NEXT_DECRYPT) > 0) rc = SQLITE_ERROR;
+      if((sqlcipher_get_test_flags() & TEST_FAIL_NEXT_DECRYPT) > 0) rc = SQLITE_ERROR;
 #endif
       if(rc != SQLITE_OK) { /* clear results of failed cipher operation and set error */
         sqlcipher_memset((unsigned char*)buffer+offset, 0, page_sz-offset);
diff --git a/src/crypto.h b/src/crypto.h
@@ -195,6 +195,8 @@ static int cipher_isHex(const unsigned char *hex, int sz){
 #ifdef SQLCIPHER_TEST
 #define TEST_FAIL_NEXT_ENCRYPT (1ul << 0) /* 1 */ 
 #define TEST_FAIL_NEXT_DECRYPT (1ul << 1) /* 2 */ 
+int sqlcipher_get_test_flags(void);
+void sqlcipher_set_test_flags(int);
 #endif
 
 /* extensions defined in crypto_impl.c */
diff --git a/src/crypto_impl.c b/src/crypto_impl.c
@@ -44,6 +44,12 @@
 #endif
 #endif
 
+#ifdef SQLCIPHER_TEST
+static volatile int cipher_test_flags = 0;
+#endif
+
+/* Generate code to return a string value */
+
 static volatile unsigned int default_flags = DEFAULT_CIPHER_FLAGS;
 static volatile unsigned char hmac_salt_mask = HMAC_SALT_MASK;
 static volatile int default_kdf_iter = PBKDF2_ITER;
@@ -396,6 +402,16 @@ char* sqlcipher_version() {
     return version;
 }
 
+#ifdef SQLCIPHER_TEST
+int sqlcipher_get_test_flags() {
+  return cipher_test_flags;
+}
+
+void sqlcipher_set_test_flags(int flags) {
+  cipher_test_flags = flags;
+}
+#endif
+
 /**
   * Initialize new cipher_ctx struct. This function will allocate memory
   * for the cipher context and for the key
