522a3d0934
Merge branch 'master' into v2beta
...
Conflicts:
Makefile.in
2011-12-26 15:29:56 -05:00
dea8ae9ace
Merge branch 'sqlite-release' into release-integration
...
Conflicts:
Makefile.in
2011-12-26 15:00:48 -05:00
ddb595fbc9
upstream 3.7.9
2011-12-26 14:52:17 -05:00
efe8c324c5
Merge branch 'v2beta' of github.com:sjlombardo/sqlcipher into v2beta
...
Conflicts:
test/crypto.test
2011-10-12 14:25:36 -04:00
50c0ed42af
SQLC-6: ensure proper behavior of sqlcipher_export() on virtual tables (i.e. FTS3)
2011-08-17 14:15:32 -04:00
56fa635aff
SQLC-1: fix behavior for PRAGMA rekey being called as first operation or before PRAGMA key
2011-08-17 14:00:36 -04:00
648c4e50fe
Merge branch 'sqlite-release' into release-integration
2011-08-17 13:18:08 -04:00
12069ec913
track 3.7.7.1
2011-08-17 13:17:32 -04:00
55692c9b4e
update to export test for large database and FTS3 virtual tables
2011-05-20 22:11:19 -04:00
f1ebbc0d6c
add explicit test for WAL journal mode operation
2011-05-08 22:31:37 -04:00
f5c62a0fd1
Merge branch 'sqlite-release' into integration
2011-05-05 22:39:20 -04:00
7cffc8807d
track 3.7.6.2
2011-05-05 22:37:34 -04:00
92e4ad7436
implementation of sqlcipher_export() function to copy schema and data between databases
2011-04-14 16:44:29 -04:00
76c1e11fe3
refactoring encryption interface so codec interface is separate from crypto implementation
2011-03-02 13:15:13 -05:00
9c7104eeb9
fix comments in test suite
2011-02-19 14:45:30 -05:00
8cf3ad8e1e
add test to verify that you attach and copy from non-hmac database to new format
2011-02-17 16:16:30 -05:00
dd911f3023
add a test to verify that it is possible to open a 1.1.8 database when changing cipher_use_hmac pragma
2011-02-17 11:50:24 -05:00
f003dfad13
Merge branch 'sqlite-release' into v2-integration
...
Conflicts:
Makefile.in
2011-02-16 16:24:07 -05:00
fc5fc812f6
track 3.7.5
2011-02-16 16:14:46 -05:00
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
8a76b73193
Merge branch 'sqlite-release' into integration
2010-08-28 08:38:03 -04:00
92bc32215d
track 3.7.2
2010-08-28 08:35:57 -04:00
fe11a8cb66
Merge branch 'sqlite-release'
2010-08-06 23:08:05 -04:00
953ca18eb6
track 3.7.0.1
2010-08-06 23:07:48 -04:00
29b781102a
Merge branch 'sqlite-release' into integration
...
Conflicts:
Makefile.in
test/quick.test
2010-07-22 09:23:51 -04:00
7b63a4edde
track 3.7.0
2010-07-22 09:16:22 -04:00
11a0e2bb8f
Merge branch 'sqlite-release' into release-integration
2010-05-18 12:24:16 -04:00
4bb256127b
update 3.6.23.1
2010-05-18 12:22:17 -04:00
c10960834f
fix issue where it wasn't possible to ATTACH an unencrypted database
2010-02-25 11:58:56 -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
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
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
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
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
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
3fd228f5a3
First attempt at JIT salt and key data derivation
2009-04-21 21:50:54 -04:00
9a13dce6d4
initial implementation of PBKDF2 using SHA256 for key derivation
2009-04-21 16:32:07 -04:00
6737773707
Merge branch 'sqlite-release'
2009-04-21 10:50:03 -04:00
81f606f59f
track 3.6.13
2009-04-21 10:39:00 -04:00
7b9260a6e9
renamed codec.* to crypto.* for clarity
2009-02-20 17:26:13 -05:00
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
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
6e36436ed9
track sqlite 3.6.11
2009-02-20 15:33:35 -05:00
d85be36fd7
more fixes to licensing of code
2008-11-30 13:59:21 -05:00
a978ba3655
Merge branch 'sqlite-release'
2008-08-19 01:08:56 -04:00
2893a5d0b2
update baseline to sqlite version 3.6.1
2008-08-19 01:05:45 -04:00
d5c4edebd9
now rekey can be used on unencrpyted databases to encrypt the data
2008-08-19 00:45:46 -04:00
28585dbd6a
add more test coverage; fix rekey bug related to MJ_PAGE_NO
2008-08-10 22:39:35 -04:00
199bbc466d
adjust test suite for new error message
2008-08-09 08:46:35 -04:00
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
211a71ea9c
identify and exclude tests that cause permanent errors due to encrypted file format
2008-08-01 21:39:17 -04:00
617ed01e77
commit of sqlite 3.6.0
2008-07-30 09:15:43 -04:00
Stephen Lombardo