Skip to content

Update sqlcipher to 4.7.0 #2

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
jamiebuilds-signal merged 2 commits into from
Apr 3, 2025
Merged

Update sqlcipher to 4.7.0 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4518cd9
Update sqlcipher to 4.7.0
jamiebuilds-signal Apr 2, 2025
1713255
Fix build
jamiebuilds-signal Apr 2, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ cd deps/sqlcipher
export OPENSSL_PREFIX=`brew --prefix openssl`
export CFLAGS="-I $OPENSSL_PREFIX/include"
export LIBRARY_PATH="$LIBRARY_PATH:$OPENSSL_PREFIX/lib"
./update.sh v4.6.1
./update.sh v4.7.0
cd -
```

Expand Down
2 changes: 1 addition & 1 deletion deps/sqlcipher/LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2008-2023, ZETETIC LLC
Copyright (c) 2025, ZETETIC LLC
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
24 changes: 0 additions & 24 deletions deps/sqlcipher/patches/sqlcipher/custom-crypto-provider.diff
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions .../sqlcipher/patches/sqlcipher/fix-constant-expression-for-msvc-arm64-6c103aee6f146869.diff
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions deps/sqlcipher/sqlcipher.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@
'SQLITE_HAS_CODEC',
'SQLITE_TEMP_STORE=2',
'SQLITE_SECURE_DELETE',
'SQLITE_EXTRA_INIT=sqlcipher_extra_init',
'SQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown',
],
'conditions': [
['OS == "win"', {
Expand Down
14,975 changes: 9,642 additions & 5,333 deletions deps/sqlcipher/sqlite3.c
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions deps/sqlcipher/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ tag=${1?Pass a valid sqlcipher version as an argument}
rm -rf .tmp/sqlcipher
git clone --branch $tag --filter=blob:none git@github.com:sqlcipher/sqlcipher.git .tmp/sqlcipher
cd .tmp/sqlcipher
git apply ../../patches/sqlcipher/custom-crypto-provider.diff
git apply ../../patches/sqlcipher/fix-constant-expression-for-msvc-arm64-6c103aee6f146869.diff
./configure --enable-update-limit
make sqlite3.h sqlite3.c sqlite3ext.h shell.c
cd -
Expand Down
Loading