Merge pull request #266 from OP-Engineering/oscar/update-sqlcipher

Update sqlcipher

Author: ospfranco

android/CMakeLists.txt

@@ -32,7 +32,9 @@ if (USE_SQLCIPHER)
   add_definitions(
     -DOP_SQLITE_USE_SQLCIPHER=1
     -DSQLITE_HAS_CODEC
-    -DSQLITE_TEMP_STORE=2
+    -DSQLITE_TEMP_STORE=3
+    -DSQLITE_EXTRA_INIT=sqlcipher_extra_init
+    -DSQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown
   )
 
   find_package(openssl REQUIRED CONFIG)

android/build.gradle

@@ -238,7 +238,7 @@ dependencies {
   implementation 'com.facebook.react:react-native'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   if (useSQLCipher) {
-    implementation('com.android.ndk.thirdparty:openssl:1.1.1q-beta-1')
+    implementation('io.github.ronickg:openssl:3.3.2')
   }
 }
 

cpp/sqlcipher/sqlite3.c

@@ -67,13 +67,12 @@
   },
   "op-sqlite": {
     "libsql": false,
-    "sqlcipher": false,
+    "sqlcipher": true,
     "iosSqlite": false,
     "fts5": true,
     "rtree": true,
     "crsqlite": false,
     "sqliteVec": false,
-    "sqliteFlags": "-DSQLITE_TEMP_STORE=2",
     "performanceMode": true,
     "tokenizers": [
       "wordtokenizer",

cpp/sqlcipher/sqlite3.h

@@ -17,7 +17,7 @@ let expect = chai.expect;
 const expectedVersion = isLibsql()
   ? '3.45.1'
   : isSQLCipher()
-  ? '3.46.1'
+  ? '3.49.1'
   : '3.49.1';
 const flavor = isLibsql() ? 'libsql' : isSQLCipher() ? 'sqlcipher' : 'sqlite';
 

example/package.json

@@ -129,7 +129,7 @@ Pod::Spec.new do |s|
   if use_sqlcipher then
     log_message.call("[OP-SQLITE] using SQLCipher 🔒")
     exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/libsql/bridge.c", "cpp/libsql/bridge.h", "cpp/libsql/bridge.cpp", "cpp/libsql/libsql.h"]
-    xcconfig[:GCC_PREPROCESSOR_DEFINITIONS] += " OP_SQLITE_USE_SQLCIPHER=1 HAVE_FULLFSYNC=1 SQLITE_HAS_CODEC SQLITE_TEMP_STORE=2"
+    xcconfig[:GCC_PREPROCESSOR_DEFINITIONS] += " OP_SQLITE_USE_SQLCIPHER=1 HAVE_FULLFSYNC=1 SQLITE_HAS_CODEC SQLITE_TEMP_STORE=3 SQLITE_EXTRA_INIT=sqlcipher_extra_init SQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown"
     s.dependency "OpenSSL-Universal"    
   elsif use_libsql then
     log_message.call("[OP-SQLITE] using libsql 📘")