c10960834f
fix issue where it wasn't possible to ATTACH an unencrypted database
2010-02-25 11:58:56 -05:00
445b6d3442
Merge branch 'master' into ditto
2009-12-30 14:52:42 -05:00
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
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
b80464125c
Merge branch 'master' into ditto
2009-12-20 23:04:56 -05:00
982f416442
add missing sqlite3PageFree and sqlite3PcacheClose to sqlite3PagerClose missed in previous merge
2009-12-20 00:05:44 -05:00
0e55063b10
remove rekey-plaintext test, not supported on master
2009-12-19 16:10:53 -05:00
2b97c700e9
Merge branch 'sqlite-release' into integration
...
Conflicts:
Makefile.in
2009-12-19 15:58:56 -05:00
090d3d3b9b
update to 3.6.21
2009-12-19 15:56:40 -05:00
c6042bb75f
add ditto include directory based on $(DITTO_SRC) to project c flags
2009-12-09 13:02:35 -05:00
d05405a90e
Merge commit 'origin'; branch 'master' into ditto
2009-12-06 14:14:36 -05:00
c969c4fcfa
fixes to please gcc
2009-12-05 20:51:51 -05:00
fde0756e83
minor cleanup and code changes to please VS.NET compiler
2009-12-06 01:45:54 +00:00
b66dd49202
patches to allow ditto to be compiled statically
2009-12-05 19:57:48 -05:00
063f9cdd2d
Merge branch 'sqlite-release' into integration
2009-12-03 16:25:00 -05:00
7941e188aa
track upstream 3.6.20
2009-12-03 16:24:07 -05:00
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
84e17044df
sqlcipher compatibility changes for upstream 3.6.17
2009-08-11 16:49:37 -04:00
1a81194b38
Merge branch 'sqlite-release' into merge-3.6.17
2009-08-11 16:02:56 -04:00
db1d641a44
update to upstream sqlite 3.6.17
2009-08-11 16:01:51 -04:00
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
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
e47eea5646
Update readme to include additional project information and clarify lack of support for rekeying unencrypted databases
2009-07-09 00:58:58 -04:00
135ac7be93
compile with SQLITE_TEMP_STORE=2 to use memory temp store by default
2009-06-23 11:55:26 -04:00
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
06cad3fe22
disable assertions in sqlite3 amalgamation compile flags
2009-05-30 01:04:20 -04:00
c892464f31
Added XCode static library project
2009-05-29 23:13:10 -04:00
e55dd0ebd0
Merge branch 'sqlite-release'
2009-05-08 05:31:05 -04:00
b9df4d3c78
regenerated broken upstream configure script using autoconf
2009-05-08 05:30:31 -04:00
fee0308d2b
Merge branch 'sqlite-release'
2009-05-08 05:27:46 -04:00
7fa21065e9
update to upstream sqlite 3.6.14
2009-05-08 05:27:02 -04:00
0ecc7c7852
resolve signed integer reference warning
2009-04-27 15:52:29 -04:00
86376028f4
use PKCS5_PBKDF2_HMAC_SHA1 for improved compatibility with more widely distributed openssl libraries
2009-04-24 15:45:40 -04:00
276ad912c0
fix bug preventing detection of hex keys
2009-04-22 16:40:45 -04:00
ff21f20cfe
back out convertnosalt changes
2009-04-22 16:27:39 -04:00
0cc240ac78
support BLOB syntax for specifying binary keys
2009-04-22 16:22:08 -04:00
1d25ff34fe
add test coverage for schema alterations
2009-04-22 11:52:03 -04:00
543220f2e7
added test coverage for locking across multiple database handles
2009-04-22 11:37:38 -04:00
4e87eca3ae
fix up closing of dbs after each test
2009-04-22 11:27:52 -04:00
f20d127e83
expanded test for making changes to ATTACHED databases
2009-04-22 11:20:54 -04:00
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
cfd52b7436
implement test of in memory databases
2009-04-22 08:54:33 -04:00
90348f8df3
remove unused variables
2009-04-22 01:04:07 -04:00
8d52707aa1
Load salt and prepare key in sqlite3CodecAttach
2009-04-21 22:38:41 -04:00
3fd228f5a3
First attempt at JIT salt and key data derivation
2009-04-21 21:50:54 -04:00
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
9a13dce6d4
initial implementation of PBKDF2 using SHA256 for key derivation
2009-04-21 16:32:07 -04:00
c8f4309d3f
Update README to reflect current build options, hex key pragmas, and rekey functionality
2009-04-21 12:37:23 -04:00
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
6737773707
Merge branch 'sqlite-release'
2009-04-21 10:50:03 -04:00
Stephen Lombardo
unknown