Commit Graph

975 Commits

Author SHA1 Message Date
Stephen Lombardo
c50f84f591 Avoids overwriting log level and target if they've already been set
This commit corrects an issue what could occur if cipher_log_level
and/or cipher_log are set prior to activating sqlcipher, i.e. if
those pragmas are called before PRAGMA key or sqlite3_key. In that
case the specific requested log settings would be ovewritten by
different defaults.
2024-07-03 15:18:44 -04:00
Stephen Lombardo
addaa4c047 Merge sqlite-release(3.46.0) into prerelease-integration 2024-05-23 14:14:12 -04:00
Stephen Lombardo
58e90d6b29 Snapshot of upstream SQLite 3.46.0 2024-05-23 13:52:30 -04:00
Stephen Lombardo
91520d4174 version bump to 4.6.1 2024-05-23 13:34:01 -04:00
Stephen Lombardo
569876dd07 downgrade memory unlock failures to info level and fix function name in log output 2024-05-17 13:44:07 -04:00
Stephen Lombardo
033cc64f7a correct function name in sqlcipher_mlock log output 2024-05-17 13:36:18 -04:00
Stephen Lombardo
148c2bfd66 skip uneccesary sqlcipher_free calls 2024-05-17 13:32:48 -04:00
Stephen Lombardo
4d9f4980c5 update changelog 2024-05-15 10:49:09 -04:00
Stephen Lombardo
85f42ea8f9 Merge branch 'master' into prerelease 2024-05-15 10:41:25 -04:00
Stephen Lombardo
dfecf0a41e bump version to 4.6.0 2024-05-09 12:16:53 -04:00
Stephen Lombardo
e7852e3c64 log santization and cleanup 2024-05-08 11:45:25 -04:00
Stephen Lombardo
ae4db2a970 Merge branch 'prerelease' of ssh://git.zetetic.net/sqlcipher into prerelease 2024-05-06 16:42:44 -04:00
Stephen Lombardo
5601211fe9 establish default sqlcipher log level and target upon first activation 2024-05-06 15:00:28 -04:00
Stephen Lombardo
e991e64acf reduce level for autovacuum short read logging 2024-05-06 14:29:43 -04:00
Micah Moore
35b074f5b8 Removes empty NSPrivacyCollectedDataType from PrivacyInfo.xcprivacy. 2024-05-02 18:47:07 -04:00
Stephen Lombardo
1205c8595d bump version to 4.5.9 2024-05-01 15:44:49 -04:00
Stephen Lombardo
840c42ff68 bump version to 4.5.8 2024-04-30 10:38:05 -04:00
Micah Moore
832e658960 Moves _SQLITE3_H_=1 _FTS5_H=1 _SQLITE3RTREE_H_=1 for podspec to user_target_xcconfig as we only want that applied to the consuming project. 2024-04-24 11:08:56 -04:00
Stephen Lombardo
2d6941f26d update changelog 2024-04-16 13:33:08 -04:00
Stephen Lombardo
608d28e707 Merge sqlite-release(3.45.3) into prerelease-integration 2024-04-15 17:34:44 -04:00
Stephen Lombardo
7b69f52ebc Snapshot of upstream SQLite 3.45.3 2024-04-15 17:24:34 -04:00
Stephen Lombardo
e94562c698 fix malformed man caused by old merge conflict 2024-04-11 16:07:58 -04:00
Micah Moore
46306ecf54 Adds Privacy Accessed API Types to Privacy manifest for file timestamp + disk space usages. 2024-04-09 12:23:04 -04:00
Stephen Lombardo
a701a38e1f Merge branch 'prerelease' of github.com:sqlcipher/sqlcipher into prerelease 2024-03-25 14:52:06 -04:00
Micah Moore
4218fd5a38 Increases iOS and tvOS version in podspec to 12.0 which is the minimum of Xcode 15.3 2024-03-18 16:13:39 -04:00
Micah Moore
86ae0bde24 Adds _SQLITE3_H_=1 _FTS5_H=1 _SQLITE3RTREE_H_=1 to podspec GCC_PREPROCESSOR_DEFINITIONS to avoid redefinition conflicts when consuming project uses Swift and import SQLite3 module. 2024-03-18 16:11:00 -04:00
Stephen Lombardo
d8ce34c844 Merge sqlite-release(3.45.2) into prerelease-integration 2024-03-18 13:35:40 -04:00
Stephen Lombardo
0eb60296ad Snapshot of upstream SQLite 3.45.2 2024-03-18 13:11:44 -04:00
Stephen Lombardo
53f02caee0 ensure a single log output target per invocation of sqlcipher_log() and avoid reuse of params 2024-03-15 11:59:59 -04:00
Stephen Lombardo
70c31b9b88 allow exclusion of device-specific log functionality via SQLCIPHER_OMIT_LOG_DEVICE 2024-03-11 12:22:14 -04:00
Stephen Lombardo
8a098cbe78 instruct amalgamator not to cache openssl includes 2024-03-09 14:30:08 -05:00
Stephen Lombardo
62e677759b correct log formatting 2024-03-07 20:02:03 -05:00
Stephen Lombardo
9b5158e053 add "device" logging and profile target using os_log for apple (and logcat on android) 2024-03-07 10:49:56 -05:00
Stephen Lombardo
55abcfd387 relocate reference databases under sqlcipher-resources 2024-02-23 13:15:11 -05:00
Stephen Lombardo
228b244eb3 add privacy manifest for cocoapods 2024-02-23 12:49:56 -05:00
Stephen Lombardo
ae808b5cf7 fix compilation with SQLCIPHER_OMIT_LOG
reported in PR #504
2024-02-22 15:38:56 -05:00
Stephen Lombardo
3fe41793e9 Merge sqlite-release(3.45.1) into prerelease-integration 2024-02-01 10:43:19 -05:00
Stephen Lombardo
a23eddc1fc Snapshot of upstream SQLite 3.45.1 2024-02-01 10:31:17 -05:00
Stephen Lombardo
336f404742 Merge sqlite-release(3.45.0) into prerelease-integration 2024-01-18 16:07:25 -05:00
Stephen Lombardo
a4df8d60a1 Snapshot of upstream SQLite 3.45.0 2024-01-18 15:38:50 -05:00
Stephen Lombardo
ddc7aa91d2 bump version 2024-01-18 15:29:41 -05:00
Stephen Lombardo
befb070909 update changelog 2024-01-05 16:38:39 -05:00
Stephen Lombardo
c17098215d Merge sqlite-release(3.44.2) into prerelease-integration 2023-11-27 16:07:37 -05:00
Stephen Lombardo
abe2103339 Snapshot of upstream SQLite 3.44.2 2023-11-27 15:28:06 -05:00
Stephen Lombardo
c6bf239e2b cipher_integrity check will report expected page size if invalid 2023-11-15 10:06:09 -05:00
Stephen Lombardo
45a205917f update LICENSE.md with SQLCipher license to avoid ambiguity and remove redundance 2023-11-13 13:10:08 -05:00
Stephen Lombardo
837524f979 Merge sqlite-release(3.44.0) into prerelease-integration 2023-11-03 10:07:24 -04:00
Stephen Lombardo
cc74415468 Snapshot of upstream SQLite 3.44.0 2023-11-03 09:50:08 -04:00
Stephen Lombardo
94ddedabaa Merge sqlite-release(3.43.2) into prerelease-integration 2023-10-12 16:53:01 -04:00
Stephen Lombardo
d35c517999 Snapshot of upstream SQLite 3.43.2 2023-10-12 16:41:17 -04:00