Stephen Lombardo
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
Stephen Lombardo
3f985f1f47
replace getBoolean to use new sqlite3GetBoolean function
2011-08-17 13:24:33 -04:00
Stephen Lombardo
648c4e50fe
Merge branch 'sqlite-release' into release-integration
2011-08-17 13:18:08 -04:00
Stephen Lombardo
12069ec913
track 3.7.7.1
2011-08-17 13:17:32 -04:00
Steven Parkes
e6396f9297
cleanup warnings
2011-05-09 15:31:27 -07:00
Steven Parkes
d1af70233a
-ansi -pedantic -std=c99 warning clean
2011-05-09 15:22:44 -07:00
Stephen Lombardo
f5c62a0fd1
Merge branch 'sqlite-release' into integration
2011-05-05 22:39:20 -04:00
Stephen Lombardo
7cffc8807d
track 3.7.6.2
2011-05-05 22:37:34 -04:00
Stephen Lombardo
946f363290
remove return on void function
2011-04-17 21:51:41 -04:00
Stephen Lombardo
92e4ad7436
implementation of sqlcipher_export() function to copy schema and data between databases
2011-04-14 16:44:29 -04:00
Stephen Lombardo
76c1e11fe3
refactoring encryption interface so codec interface is separate from crypto implementation
2011-03-02 13:15:13 -05:00
Stephen Lombardo
7531bed022
allow HMAC behavior override via DEFAULT_USE_HMAC
2011-02-19 14:57:11 -05:00
Stephen Lombardo
ffcb4f7fd9
refactor calculation of reserve space
2011-02-17 01:49:01 -05:00
Stephen Lombardo
3aefd5e5de
codec_hmac uses hmac key
2011-02-17 00:14:54 -05:00
Stephen Lombardo
f003dfad13
Merge branch 'sqlite-release' into v2-integration
...
Conflicts:
Makefile.in
2011-02-16 16:24:07 -05:00
Stephen Lombardo
fc5fc812f6
track 3.7.5
2011-02-16 16:14:46 -05:00
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
c45622d14d
mutexes in rekey
2010-10-03 08:56:16 -04:00
Stephen Lombardo
658cb02be9
update other areas relying on GetPageSize to use default; Enter db->mutex before forcing page size
2010-10-03 01:14:16 -04:00
Stephen Lombardo
a1439c8d71
resolve bug where page size is improperly set
2010-10-01 13:07:37 -04:00
Stephen Lombardo
ebecc71a89
accommodate new void return from sqlite3PagerPagecount
2010-08-28 08:44:25 -04: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
59e8fd2113
change if to ifdef to placate VS
2010-08-28 08:31:38 -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
4f320b6336
thread safe eutex in activate_openssl
2010-06-09 14:39:25 -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
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
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
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
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