183 Commits

Author SHA1 Message Date
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
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
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
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
Stephen Lombardo
fee1153e5c adjust default page size to 4096 2018-08-30 13:14:18 -04:00
Stephen Lombardo
1bb4737da2 adds PRAGMA default_cipher_plaintext_header_size and tests 2018-01-18 10:22:12 -05:00
Stephen Lombardo
a7c459aa77 implementation of PRAGMAs cipher_plaintext_header_sz and cipher_salt 2018-01-17 14:20:41 -05:00
Nick Parker
821782a23b Adjust error text for SQLITE_ERROR and SQLITE_NOTADB occurrences 2017-09-29 14:28:00 -05:00
Nick Parker
8cb1e8d956 Bump version in cipher_version test 2017-09-29 11:31:27 -05:00
Nick Parker
be789e94dd Merge sqlite-release(3.20.1) into prerelease-integration 2017-09-27 16:12:26 -05:00
Nick Parker
1f3bc22483 Snapshot of upstream SQLite 3.20.1 2017-09-27 16:07:03 -05:00
Nick Parker
e48b328fb9 Simplify sqlcipher_export tracing test 2017-05-25 13:56:02 -05:00
Nick Parker
8a43a6273a Fix sqlcipher_export & cipher_migrate when tracing API used 2017-05-25 13:44:23 -05:00
Nick Parker
5f00cf1df0 Update cipher_version test to 3.4.1 2016-12-22 09:42:16 -06:00
Nick Parker
26ac02ed18 Adjust path to test databases for tests 2016-12-09 11:50:14 -06:00
Nick Parker
bae72ae4e3 Merge sqlite-release(3.15.2) into prerelease-integration 2016-12-06 13:10:27 -06:00
Nick Parker
51ec837e61 Snapshot of upstream SQLite 3.15.2 2016-12-05 14:29:15 -06:00
Nick Parker
1dd36b8384 Merge remote-tracking branch 'origin/sqlite-release' into prerelease-integration 2016-12-05 14:09:57 -06:00
Nick Parker
5958df7f25 Revert "Merge sqlite-release(3.11.0) into prerelease-integration"
This reverts commit 3550fb400a17bb440a5fbea59da6abf8a318b095, reversing
changes made to 4c87a22299b8a6165b6ab9bae8b927f5c7d761ac.
2016-12-02 16:24:56 -06:00
Nick Parker
c1f7fe783c Prevent writing database with cipher set to invalid value 2016-05-25 16:37:54 -05:00
Nick Parker
9644b9fe85 Snapshot of upstream SQLite 3.11.0 2016-02-23 09:07:39 -06:00
Nick Parker
3550fb400a Merge sqlite-release(3.11.0) into prerelease-integration 2016-02-22 11:20:06 -06:00
Nick Parker
376eb11e20 Snapshot of upstream SQLite 3.11.0 2016-02-22 10:40:43 -06:00
Nick Parker
d1e1e72fb0 Adjust cipher_version test for 3.3.1 release 2015-07-13 11:58:18 -05:00
Nick Parker
595ef07930 Merge sqlite-release(3.8.10.2) into prerelease-integration 2015-07-10 14:30:07 -05:00
Nick Parker
724d1aac99 Snapshot of upstream SQLite 3.8.10.2 2015-07-10 14:14:29 -05:00
Nick Parker
18f95ebbea Check for valid context before using cipher_store_pass
Identified by Nicholas Starke
2015-04-21 14:08:41 -05:00
Nick Parker
c14afcf742 Prevent segfault when invalid cipher name provided, identified by Nicholas Starke 2015-04-16 08:57:29 -05:00
Nick Parker
4677f474b1 Bump cipher_version value in test 2015-03-20 10:49:35 -05:00
Nick Parker
edf2c86154 Merge sqlite-release(3.8.8.3) into prerelease-integration 2015-03-20 09:37:39 -05:00
Nick Parker
d4954191b9 Snapshot of upstream SQLite 3.8.8.3 2015-03-20 09:04:26 -05:00
Nick Parker
a31d65d7c8 Add support for attaching databases with non-default page sizes 2015-01-29 10:39:12 -06:00
Nick Parker
c0b9920fa3 Change cipher_version test to match current version 2014-09-30 13:43:13 -05:00
Nick Parker
683a5e7b8e Merge sqlite-release(3.8.6) into prerelease-integration 2014-09-30 08:45:24 -05:00
Nick Parker
0b99d5d75c Snapshot of upstream SQLite 3.8.6 2014-09-30 08:40:45 -05:00
Nick Parker
4e3ffe8c11 Adjust cipher version test 2014-08-18 10:13:07 -05:00
Nick Parker
90606b3d03 Add PRAGMA cipher_store_pass
PRAGMA cipher_store_pass allows the passphrase to remain in memory
which will allow an ATTACH statement to succeed without providing
the key value during ATTACH when both databases use the same passphrase,
but have different salt values.  Previously, in order to ATTACH with
this scneario, calling ATTACH required providing the key value inline.
2014-06-13 16:18:02 -05:00
Nick Parker
82db0d7e90 Merge sqlite-release(3.8.4.3) into prerelease-integration
Conflicts:
	Makefile.in
	README
	VERSION
	configure
	manifest
	manifest.uuid
	sqlcipher.1
	src/pragma.c
	src/shell.c
2014-04-04 13:16:23 -05:00
Nick Parker
6eeedff248 Snapshot of upstream SQLite 3.8.4.3 2014-04-04 10:16:20 -05:00
Nick Parker
8d0acdb908 Explicitly close db in tests following cipher_migrate 2013-12-06 11:34:26 -06:00
Nick Parker
8f110848f3 Adjust cipher_version test 2013-12-06 11:33:40 -06:00
Nick Parker
bba319a716 Fix for cipher_migrate on passphrases longer than 64 characters and raw keys 2013-12-06 11:03:50 -06:00
Nick Parker
200b3146a3 Adjustment to ltc crypto provider and cipher_add_random 2013-12-03 13:32:05 -06:00
Nick Parker
95bb90e33c Merge sqlite-release(3.8.0.2) into prerelease-integration
Conflicts:
	configure
2013-10-01 14:36:23 -05:00
Nick Parker
0b3ee4466d Snapshot of upstream SQLite 3.8.0.2 2013-10-01 14:26:57 -05:00
Nick Parker
ccb36a07e2 Adjust file size of sqlcipher-3.0-testkey.db to 1 MB 2013-09-23 16:55:46 -05:00