147 Commits

Author SHA1 Message Date
Stephen Lombardo
b62c74407a improvements to pragmas, allow custom page sizes and page data checks via hmac
- now possible to set custom page size using PRAGMA cipher_page_size = N;
- allow custom pragmas to be used on attached databases
- perform hmac on page ciphertext and IV before decryption
2011-02-16 16:07:20 -05:00
Stephen Lombardo
8a76b73193 Merge branch 'sqlite-release' into integration 2010-08-28 08:38:03 -04:00
Stephen Lombardo
92bc32215d track 3.7.2 2010-08-28 08:35:57 -04:00
Stephen Lombardo
fe11a8cb66 Merge branch 'sqlite-release' 2010-08-06 23:08:05 -04:00
Stephen Lombardo
953ca18eb6 track 3.7.0.1 2010-08-06 23:07:48 -04:00
Stephen Lombardo
29b781102a Merge branch 'sqlite-release' into integration
Conflicts:
	Makefile.in
	test/quick.test
2010-07-22 09:23:51 -04:00
Stephen Lombardo
7b63a4edde track 3.7.0 2010-07-22 09:16:22 -04:00
Stephen Lombardo
11a0e2bb8f Merge branch 'sqlite-release' into release-integration 2010-05-18 12:24:16 -04:00
Stephen Lombardo
4bb256127b update 3.6.23.1 2010-05-18 12:22:17 -04:00
Stephen Lombardo
c10960834f fix issue where it wasn't possible to ATTACH an unencrypted database 2010-02-25 11:58:56 -05:00
Stephen Lombardo
b38a9d20a2 fix initialization of OpenSSL so an encrypted database can be attached to a non-encrypted main database; add test for the same 2009-12-23 21:45:51 -05:00
Stephen Lombardo
0e55063b10 remove rekey-plaintext test, not supported on master 2009-12-19 16:10:53 -05:00
Stephen Lombardo
2b97c700e9 Merge branch 'sqlite-release' into integration
Conflicts:
	Makefile.in
2009-12-19 15:58:56 -05:00
Stephen Lombardo
090d3d3b9b update to 3.6.21 2009-12-19 15:56:40 -05:00
Stephen Lombardo
063f9cdd2d Merge branch 'sqlite-release' into integration 2009-12-03 16:25:00 -05:00
Stephen Lombardo
7941e188aa track upstream 3.6.20 2009-12-03 16:24:07 -05:00
Stephen Lombardo
75eeefc0bc alter crypto test 1.9 to add several thouand tables to create a schema parse error on improper rekey 2009-08-11 17:57:57 -04:00
Stephen Lombardo
84e17044df sqlcipher compatibility changes for upstream 3.6.17 2009-08-11 16:49:37 -04:00
Stephen Lombardo
1a81194b38 Merge branch 'sqlite-release' into merge-3.6.17 2009-08-11 16:02:56 -04:00
Stephen Lombardo
db1d641a44 update to upstream sqlite 3.6.17 2009-08-11 16:01:51 -04:00
Stephen Lombardo
0acb34a113 Refactoring to allow algorithm selection and other prameters to be set at runtime
- add kdf_iter, cipher, rekey_kdf_iter, and rekey_cipher PRAGMAs to allow changing parameters
- introduction of cipher_ctx struct to store relavent cipher details for separate read and write operations
- simplified sqlite3Codec to make more understandable
- simplify encryption code for first database page
- simplify sqlite3_key and sqlite3_rekey, they now operate only on the main database only
- documentation updates for supporting functions
- reorganize tests to remove interdependencies between tests where possible
- add tests for converting between different ciphers
2009-06-07 22:51:43 -04:00
Stephen Lombardo
fee0308d2b Merge branch 'sqlite-release' 2009-05-08 05:27:46 -04:00
Stephen Lombardo
7fa21065e9 update to upstream sqlite 3.6.14 2009-05-08 05:27:02 -04:00
Stephen Lombardo
0cc240ac78 support BLOB syntax for specifying binary keys 2009-04-22 16:22:08 -04:00
Stephen Lombardo
1d25ff34fe add test coverage for schema alterations 2009-04-22 11:52:03 -04:00
Stephen Lombardo
543220f2e7 added test coverage for locking across multiple database handles 2009-04-22 11:37:38 -04:00
Stephen Lombardo
4e87eca3ae fix up closing of dbs after each test 2009-04-22 11:27:52 -04:00
Stephen Lombardo
f20d127e83 expanded test for making changes to ATTACHED databases 2009-04-22 11:20:54 -04:00
Stephen Lombardo
309deae4f6 Cache provided raw key data to provide to other attached databases; Add test case for attached DBs 2009-04-22 09:21:52 -04:00
Stephen Lombardo
cfd52b7436 implement test of in memory databases 2009-04-22 08:54:33 -04:00
Stephen Lombardo
3fd228f5a3 First attempt at JIT salt and key data derivation 2009-04-21 21:50:54 -04:00
Stephen Lombardo
9a13dce6d4 initial implementation of PBKDF2 using SHA256 for key derivation 2009-04-21 16:32:07 -04:00
Stephen Lombardo
6737773707 Merge branch 'sqlite-release' 2009-04-21 10:50:03 -04:00
Stephen Lombardo
81f606f59f track 3.6.13 2009-04-21 10:39:00 -04:00
Stephen Lombardo
7b9260a6e9 renamed codec.* to crypto.* for clarity 2009-02-20 17:26:13 -05:00
Stephen Lombardo
4314238203 takes advantage of sqlites new hexkey and hexrekey pragmas
- detect number of key bytes passed in to make decision about whether to hash key
2009-02-20 16:38:27 -05:00
Stephen Lombardo
cbbb7b2a89 Merge branch 'sqlite-release'
Conflicts:

	Makefile.in
	src/pager.c
	src/pragma.c
	tool/mksqlite3c.tcl
2009-02-20 15:52:39 -05:00
Stephen Lombardo
6e36436ed9 track sqlite 3.6.11 2009-02-20 15:33:35 -05:00
Stephen Lombardo
d85be36fd7 more fixes to licensing of code 2008-11-30 13:59:21 -05:00
Stephen Lombardo
a978ba3655 Merge branch 'sqlite-release' 2008-08-19 01:08:56 -04:00
Stephen Lombardo
2893a5d0b2 update baseline to sqlite version 3.6.1 2008-08-19 01:05:45 -04:00
Stephen Lombardo
d5c4edebd9 now rekey can be used on unencrpyted databases to encrypt the data 2008-08-19 00:45:46 -04:00
Stephen Lombardo
28585dbd6a add more test coverage; fix rekey bug related to MJ_PAGE_NO 2008-08-10 22:39:35 -04:00
Stephen Lombardo
199bbc466d adjust test suite for new error message 2008-08-09 08:46:35 -04:00
Stephen Lombardo
2fe24cf434 initial cut at a regression test script for cipher codec functionality. execute make testfixture && ./testfixture test/codec.test 2008-08-07 09:33:59 -04:00
Stephen Lombardo
211a71ea9c identify and exclude tests that cause permanent errors due to encrypted file format 2008-08-01 21:39:17 -04:00
Stephen Lombardo
617ed01e77 commit of sqlite 3.6.0 2008-07-30 09:15:43 -04:00