Skip to content

Update sqlcipher #266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ospfranco merged 6 commits into from
May 5, 2025
Merged

Update sqlcipher #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e5275d7
Update sqlcipher
ospfranco May 5, 2025
0023fa4
Update cmakelists
ospfranco May 5, 2025
b78b0cd
Update cmakelists
ospfranco May 5, 2025
8139ffc
Update cmakelists
ospfranco May 5, 2025
9b20f87
Update sqlcipher to latest version
ospfranco May 5, 2025
5a14515
Add missing definition to compile latest sqlcipher on ios
ospfranco May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion android/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
}

Expand Down
15,237 changes: 9,802 additions & 5,435 deletions cpp/sqlcipher/sqlite3.c
View file
Open in desktop

Large diffs are not rendered by default.

396 changes: 343 additions & 53 deletions cpp/sqlcipher/sqlite3.h
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion example/src/tests/dbsetup.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion op-sqlite.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 📘")
Expand Down
Loading