Commit Graph

683 Commits

Author SHA1 Message Date
Stephen Lombardo e4b66d6cc8 adds PRAGMA cipher_compatibility and cipher_default_compatibility 2018-12-12 17:24:24 -05:00
Stephen Lombardo 60b49b6826 fix prototypes (for strict-prototypes) 2018-12-12 16:37:44 -05:00
Stephen Lombardo d0eb2aab22 add history filtering for attach statements with key parameter 2018-12-04 08:53:23 -05:00
Stephen Lombardo 580fde5ad2 properly filter empty lines as reported in #293 2018-12-04 08:51:23 -05:00
Stephen Lombardo 5e991ea686 Merge branch 'prerelease' of ssh://git.zetetic.net/sqlcipher into prerelease 2018-11-30 12:13:31 -05:00
Stephen Lombardo d3468e8b8f update CHANGELOG.md for 4.0.0 release 2018-11-30 12:13:04 -05:00
Stephen Lombardo 17d6efd0f1 update podspect to reference v4.0.0 tag 2018-11-30 12:12:35 -05:00
Stephen Lombardo a4507351bd remove sqlcipher.xcodeproj 2018-11-30 12:12:10 -05:00
Micah Moore 8df14f292e Adds $(PODS_ROOT)/SQLCipher to HEADER_SEARCH_PATHS in SQLCipher.podspec.json 2018-11-08 17:00:15 -05:00
Stephen Lombardo b0c7b629ad fix memory initialization 2018-10-30 09:42:03 -04:00
Stephen Lombardo ca4b36a61a Merge branch 'prerelease' of ssh://git.zetetic.net/sqlcipher into prerelease 2018-10-29 18:31:33 -04:00
Stephen Lombardo ba2467d512 fix error in memory hook codec trace 2018-10-29 18:31:04 -04:00
Stephen Lombardo 94c88989f7 defer memory hook until after xInit 2018-10-29 17:58:34 -04:00
Stephen Lombardo 81ed3a54a2 cipher_migrate will use MoveFileExW on windows platforms 2018-10-23 13:04:03 -04:00
Stephen Lombardo 9249f54531 correct warnings for UAP builds 2018-10-23 09:08:30 -04:00
Stephen Lombardo 537dcf75e5 improve memory handling for values returned from pragmas 2018-10-18 13:01:15 -04:00
Stephen Lombardo 787cbae31a adjustments to version reporting 2018-10-17 20:31:23 -04:00
Stephen Lombardo 7e805e5388 bump version number and add qualifier 2018-10-17 15:57:40 -04:00
Stephen Lombardo 57ea35296c correct compliation under openssl 1.1.x 2018-10-10 15:55:49 -04:00
Stephen Lombardo be947c12cd correct uninitialized variables and linker error 2018-10-08 17:18:47 -04:00
Stephen Lombardo 3bd6262b59 refactor sqlcipher tests into separate files 2018-10-03 12:19:55 -04:00
Stephen Lombardo f615ede679 enable optional license support hooks 2018-10-02 16:56:49 -04:00
Stephen Lombardo 5b59212d9f Merge branch 'pull-283' into prerelease 2018-09-28 15:05:23 -04:00
Stephen Lombardo 532f48f7f1 Merge sqlite-release(3.25.2) into prerelease-integration 2018-09-28 14:57:11 -04:00
Stephen Lombardo e62fa4945b Snapshot of upstream SQLite 3.25.2 2018-09-28 14:35:21 -04:00
Stephen Lombardo 93f1b45413 expand explicit tests for common export / import scenarios 2018-09-27 13:42:06 -04:00
Stephen Lombardo c566ead72a sqlcipher_export from attached database to main (2nd parameter specifies source) 2018-09-27 13:06:59 -04:00
Stephen Lombardo 867d0dafd5 SQLCIPHER_PROFILE_USE_FOPEN can force cipher_profile to use fopen (e.g. for WinXP) 2018-09-27 10:32:13 -04:00
Stephen Lombardo bf8bffb8ac default to 256,000 PBKDF2 iterations 2018-09-21 16:30:45 -04:00
Stephen Lombardo cf7e9f9451 improved error handling for providers 2018-09-21 16:01:17 -04:00
Stephen Lombardo f177869fca fix conversion back to original journal_mode after migration 2018-09-21 14:47:14 -04:00
Stephen Lombardo 20d80b3a89 skips additonal migration checks once correct version is identified 2018-09-21 13:44:55 -04:00
Stephen Lombardo 25e895e93a take database out of WAL mode prior to migration 2018-09-21 13:42:56 -04:00
0xflotus dd3749b990
fixed programmatically 2018-09-21 15:30:47 +02:00
Stephen Lombardo 32c00dc87f fixes windows build, string overread in sqlite3OsOpen 2018-09-20 10:40:02 -04:00
Stephen Lombardo 1e601879cd improvements and simplification of cipher_migrate implementation 2018-09-19 17:11:53 -04:00
Stephen Lombardo cf8df7e2a8 fix regression from upstream merge conflict resoultion preventing non-amalgamated build 2018-09-19 16:13:40 -04:00
Stephen Lombardo 81769c189a simplify internal pager extensions and remove those that are now redundant 2018-09-18 14:24:25 -04:00
Stephen Lombardo e3c5fecbe1 Merge sqlite-release(3.25.0) into prerelease-integration 2018-09-18 12:55:53 -04:00
Stephen Lombardo bf3fa86130 Snapshot of upstream SQLite 3.25.0 2018-09-18 12:31:37 -04:00
Stephen Lombardo 6ed6609ecb use defines for modes in sqlite3Codec 2018-09-11 17:24:13 -04:00
Stephen Lombardo 369b22da7e remove PRAGMA cipher 2018-09-11 17:13:58 -04:00
Stephen Lombardo c40ffaa964 add PRAGMA cipher_memory_security to control settings; lock/unlock memory in manager 2018-09-11 12:56:45 -04:00
Stephen Lombardo 37270bd069 correct build errors and warnings 2018-09-06 13:22:54 -04:00
Stephen Lombardo 1062854faa Merge branch 'pull-247' into prerelease 2018-09-06 13:10:32 -04:00
Stephen Lombardo 184305e78e fix test setting incorrect cipher_default_page_size 2018-09-06 12:59:49 -04:00
Stephen Lombardo 915a0a4686 disable rekey_cipher & rekey_kdf_iter; major simplification of internal contexts 2018-09-06 12:11:44 -04:00
Stephen Lombardo 1cdb2fcdce cleanup to enable building with --disable-amalgamation 2018-09-06 09:52:32 -04:00
Stephen Lombardo 02cee4ca2a add support for HMAC-SHA256 and HMAC-SHA512 (default) for HMAC and PBKDF2 2018-09-05 17:39:07 -04:00
Stephen Lombardo a0320d99b3 increase to 128K KDF 2018-08-30 13:29:31 -04:00