Stephen Lombardo
74e43bd423
Merge branch 'master' into ditto
2010-02-25 12:06:43 -05: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
445b6d3442
Merge branch 'master' into ditto
2009-12-30 14:52:42 -05:00
Stephen Lombardo
433a2a6641
force allocation of IV space at end of database pages, even if current cipher doesn't require it (i.e. ECB mode)
2009-12-30 14:52:03 -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
b80464125c
Merge branch 'master' into ditto
2009-12-20 23:04:56 -05:00
Stephen Lombardo
982f416442
add missing sqlite3PageFree and sqlite3PcacheClose to sqlite3PagerClose missed in previous merge
2009-12-20 00:05:44 -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
d05405a90e
Merge commit 'origin'; branch 'master' into ditto
2009-12-06 14:14:36 -05:00
Stephen Lombardo
c969c4fcfa
fixes to please gcc
2009-12-05 20:51:51 -05:00
unknown
fde0756e83
minor cleanup and code changes to please VS.NET compiler
2009-12-06 01:45:54 +00:00
Stephen Lombardo
b66dd49202
patches to allow ditto to be compiled statically
2009-12-05 19:57:48 -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
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
4c95e61219
properly handle "case 7" journal writes that should be encrypted with the read_key, not the write_key
2009-08-11 12:16:30 -04:00
Stephen Lombardo
3ce6037365
fix segfault when calling sqlite3_rekey before sqlite3_key - openssl should be initialized on either call
2009-08-11 12:14:19 -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
0ecc7c7852
resolve signed integer reference warning
2009-04-27 15:52:29 -04:00
Stephen Lombardo
86376028f4
use PKCS5_PBKDF2_HMAC_SHA1 for improved compatibility with more widely distributed openssl libraries
2009-04-24 15:45:40 -04:00
Stephen Lombardo
276ad912c0
fix bug preventing detection of hex keys
2009-04-22 16:40:45 -04:00
Stephen Lombardo
ff21f20cfe
back out convertnosalt changes
2009-04-22 16:27:39 -04:00
Stephen Lombardo
0cc240ac78
support BLOB syntax for specifying binary keys
2009-04-22 16:22:08 -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
90348f8df3
remove unused variables
2009-04-22 01:04:07 -04:00
Stephen Lombardo
8d52707aa1
Load salt and prepare key in sqlite3CodecAttach
2009-04-21 22:38:41 -04:00
Stephen Lombardo
3fd228f5a3
First attempt at JIT salt and key data derivation
2009-04-21 21:50:54 -04:00
Stephen Lombardo
74a60987ce
a start towards allocating random salt in unused 16 byte header space at the start of the SQLite file
2009-04-21 17:36:53 -04:00
Stephen Lombardo
9a13dce6d4
initial implementation of PBKDF2 using SHA256 for key derivation
2009-04-21 16:32:07 -04:00
Stephen Lombardo
59ef6e1f46
Updated to fix compatibility with sqlite 3.6.13
...
- Removed Makefile's inclusion of backup.h (removed from distro)
- update for new sqlite3BtreeSetPageSize iFix parameter
2009-04-21 12:00:30 -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
91ab560aec
code cleanup to tighten up build warnings
2009-02-26 13:54:38 -05:00
Stephen Lombardo
a824939d24
fix page definition to PgHdr
2009-02-20 17:24:47 -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
88e6a2edf8
support amalgamated builds
2009-02-19 13:09:17 -05:00
Stephen Lombardo
d85be36fd7
more fixes to licensing of code
2008-11-30 13:59:21 -05:00
Stephen Lombardo
6b6144db0f
fixes to memory management post merge of sqlite 3.6.1
2008-08-19 10:45:11 -04: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
d9b3597d4b
remove unused HDR_SZ definition
2008-08-09 08:48:26 -04:00
Stephen Lombardo