462 Commits

Author SHA1 Message Date
Stephen Lombardo
fc04d69470 initialize memory in sqlcipher_malloc before use 2012-10-03 08:09:02 -04:00
Stephen Lombardo
273558efc6 improvements to memory comparison 2012-10-02 12:36:25 -04:00
Stephen Lombardo
9a6807e1b6 deactivation routine to call EVP_cleanup 2012-10-02 11:55:07 -04:00
Stephen Lombardo
48215584ab bump version to 2.1.0 due to functional change in hmac calculation 2012-07-18 14:50:47 -04:00
Stephen Lombardo
aec2fe4efc Merge branch 'sqlite-release' into prerelease-integration 2012-07-18 14:43:41 -04:00
Stephen Lombardo
de4f34b64d track 3.7.13 2012-07-18 14:42:52 -04:00
Stephen Lombardo
913022cc3e detect failure to initialize context (i.e. out of memory) 2012-07-18 14:40:48 -04:00
Stephen Lombardo
f1ea44e3ef pragma allows le, be, or native pgno ordering plus tests 2012-07-18 11:21:12 -04:00
Stephen Lombardo
7f2b44c8e2 DRY up and inline pragma settings 2012-07-17 22:54:38 -04:00
Stephen Lombardo
96a7738587 move pragma handling logic into crypto.c 2012-07-17 17:18:17 -04:00
Stephen Lombardo
70ef31ff5d add flag for normalizing pgno in HMAC check 2012-07-17 16:45:02 -04:00
Stephen Lombardo
7a9b9e39a1 move hmac setting to flags on cipher context 2012-07-17 16:19:40 -04:00
Stephen Lombardo
dbbbb7cca7 convert page number to little endian before MAC 2012-07-10 17:11:01 -04:00
Stephen Lombardo
bfff38581c restructure to allow non-amalgamated builds again 2012-07-09 16:59:10 -04:00
Stephen Lombardo
6dbdd4663c bump to 2.0.6 2012-06-13 16:27:09 -04:00
Stephen Lombardo
06429ca622 fix issue with short page reads causing hmac failures with auto vacuum enabled 2012-06-13 13:34:14 -04:00
Stephen Lombardo
bedfc5b588 add CODEC_HEXDUMP macro to print page data 2012-06-13 12:27:59 -04:00
Stephen Lombardo
a53d3dee76 Merge branch 'sqlite-release' into relint 2012-05-23 09:26:38 -04:00
Stephen Lombardo
35a66a5caa track 3.7.12.1 2012-05-23 09:26:02 -04:00
Stephen Lombardo
c6629b2fc7 Merge branch 'master' into prerelease 2012-05-18 11:15:36 -04:00
Nick Parker
e4822420d6 Adjusting the way string content is rendered, fixes issue on Android. 2012-05-18 10:09:15 -05:00
Stephen Lombardo
c2f7cd7926 enable secure delete on all encrypted databases 2012-05-18 02:22:40 -04:00
Stephen Lombardo
1a17b573eb fix context comparisons and log rekey errors 2012-05-17 17:29:27 -04:00
Nick Parker
525243c689 Adding PRAGMA cipher_version to identify the current SQLCipher version,
also including test.
2012-05-17 07:59:43 -05:00
Stephen Lombardo
f018888ed8 Merge branch 'release-integration' 2012-05-15 20:49:14 -04:00
Stephen Lombardo
f09f9f908a error out if key_sz is ever 0 due to context corruption 2012-05-15 20:48:10 -04:00
Stephen Lombardo
0330944245 resolv warnings under -DCODEC_DEBUG 2012-05-15 20:25:53 -04:00
Stephen Lombardo
f26e6abad6 updates for compatibility with 3.7.12 functions 2012-05-15 19:18:44 -04:00
Stephen Lombardo
53c6fc9f5f Merge branch 'sqlite-release' into release-integration 2012-05-15 19:06:40 -04:00
Stephen Lombardo
c8c482ab80 track 3.7.12 2012-05-15 19:05:34 -04:00
Stephen Lombardo
aa848ebc08 Merge branch 'release-merge' 2012-02-29 11:39:45 -05:00
Stephen Lombardo
8f061f1a50 add pragma cipher_default_use_hmac to toggle global HMAC setting 2012-02-29 11:14:42 -05:00
Stephen Lombardo
758cc138d9 use new btsFlags under 3.7.10 instead of pageSizeFixed 2012-01-18 00:37:15 -05:00
Stephen Lombardo
eb9b65750d Merge branch 'sqlite-release' into release-merge 2012-01-18 00:19:02 -05:00
Stephen Lombardo
d09051a1f2 track 3.7.10 2012-01-18 00:18:26 -05:00
Stephen Lombardo
cdfd2a3d3a ensure that pragmas don't do anything unless a context is initialized on the db 2012-01-18 00:15:01 -05:00
Stephen Lombardo
3a68b1bbca clarify trace message for raw key 2012-01-13 12:28:13 -05:00
Stephen Lombardo
8ce46cd998 Revert "perform fast key derivation on raw keys"
This reverts commit 2e868032dc0acbf631bcdb36345eaf1b900d9b14.
2012-01-13 12:27:16 -05:00
Stephen Lombardo
2e868032dc perform fast key derivation on raw keys 2012-01-13 00:18:23 -05:00
Stephen Lombardo
f7591e02fe rework hmac key derivation based on low iteration PBKDF2 with static salt mask 2012-01-12 23:42:55 -05:00
Stephen Lombardo
9c0dd8d449 improved HMAC key derivation
- ensure that the HMAC key derivation salt is different from
  that used to generate the encryption key
- allow the number of pbkdf2 iterations used for HMAC key
  derivation to be configured at runtime via pragma
2012-01-03 17:26:44 -05:00
Stephen Lombardo
ec013d7b51 allocate EVP_CIPHER_CTX and HMAC_CTX as part of cipher_ctx's locked heap memory 2012-01-03 11:05:11 -05:00
Stephen Lombardo
95049844a8 add notice 2011-12-28 11:20:02 -05:00
Stephen Lombardo
b673c72215 fix warnings under visual studio 2011-12-27 13:25:08 -05:00
Stephen Lombardo
786292f703 fixes for compilation under os x 2011-12-27 13:00:58 -05:00
Stephen Lombardo
5d4ded1850 fix hmac calls on macosx 2011-12-27 12:27:41 -05:00
Stephen Lombardo
15118068de memory locking 2011-12-27 12:15:58 -05:00
Stephen Lombardo
823a099e5e improvements to error handling 2011-12-27 11:30:54 -05:00
Stephen Lombardo
0da4a1a5c5 minor cleanups 2011-12-27 11:05:43 -05:00
Stephen Lombardo
9f710946ac explicitly use RAND_bytes per issue #15 2011-12-27 10:35:43 -05:00