0e8cdf4b25
test for rekey after a large delete
2012-05-17 19:07:57 -04:00
1a17b573eb
fix context comparisons and log rekey errors
2012-05-17 17:29:27 -04:00
8a734f2219
expand rekey tests
2012-05-17 17:29:01 -04:00
1397c0bcaf
Merge branch 'prerelease'
2012-05-17 12:36:32 -04:00
3f81bbc668
Merge branch 'master' of github.com:sqlcipher/sqlcipher
2012-05-17 12:35:59 -04:00
8e4d13b57f
Merge pull request #24 from developernotes/prerelease
...
PRAGMA cipher_version
2012-05-17 06:15:24 -07:00
525243c689
Adding PRAGMA cipher_version to identify the current SQLCipher version,
...
also including test.
2012-05-17 07:59:43 -05:00
f018888ed8
Merge branch 'release-integration'
2012-05-15 20:49:14 -04:00
f09f9f908a
error out if key_sz is ever 0 due to context corruption
2012-05-15 20:48:10 -04:00
0330944245
resolv warnings under -DCODEC_DEBUG
2012-05-15 20:25:53 -04:00
f26e6abad6
updates for compatibility with 3.7.12 functions
2012-05-15 19:18:44 -04:00
53c6fc9f5f
Merge branch 'sqlite-release' into release-integration
2012-05-15 19:06:40 -04:00
c8c482ab80
track 3.7.12
2012-05-15 19:05:34 -04:00
b6302e30a2
disable key initialization on the no-encryption speed test
2012-05-07 11:05:22 -04:00
885ffa94a4
update xcode project file to set -mno-thumb for armv6 only
2012-02-29 11:56:30 -05:00
aa848ebc08
Merge branch 'release-merge'
2012-02-29 11:39:45 -05:00
8f061f1a50
add pragma cipher_default_use_hmac to toggle global HMAC setting
2012-02-29 11:14:42 -05:00
ff9a340039
add -mno-thumb cflag to avoid armv6 crash
2012-01-25 01:17:51 -05:00
758cc138d9
use new btsFlags under 3.7.10 instead of pageSizeFixed
2012-01-18 00:37:15 -05:00
eb9b65750d
Merge branch 'sqlite-release' into release-merge
2012-01-18 00:19:02 -05:00
d09051a1f2
track 3.7.10
2012-01-18 00:18:26 -05:00
cdfd2a3d3a
ensure that pragmas don't do anything unless a context is initialized on the db
2012-01-18 00:15:01 -05:00
75f060efa7
add a prominent LICENSE file (to help make sure terms are clear)
2012-01-13 14:04:01 -05:00
3a68b1bbca
clarify trace message for raw key
2012-01-13 12:28:13 -05:00
8ce46cd998
Revert "perform fast key derivation on raw keys"
...
This reverts commit 2e868032dc
2012-01-13 12:27:16 -05:00
f963c3e48c
test for use of raw key with attached database
2012-01-13 09:51:19 -05:00
1a3e1c793d
tests for vacuum behavior on encrypted databases
2012-01-13 02:10:15 -05:00
2e868032dc
perform fast key derivation on raw keys
2012-01-13 00:18:23 -05:00
f7591e02fe
rework hmac key derivation based on low iteration PBKDF2 with static salt mask
2012-01-12 23:42:55 -05:00
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
0d1e81061d
Merge branch 'master' into v2beta
...
Conflicts:
src/crypto.c
2012-01-03 11:17:36 -05:00
640cd85a5d
move EVP_CIPHER_CTX to locked heap memory
2012-01-03 11:16:05 -05:00
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
6c2c80fce0
Merge branch 'master' into v2beta
2011-12-28 11:40:15 -05:00
12ed2a3228
long overdue updates to the README file
2011-12-28 11:39:50 -05:00
95049844a8
add notice
2011-12-28 11:20:02 -05:00
60e618032c
Merge branch 'master' into v2beta
...
Conflicts:
src/crypto.c
2011-12-28 11:06:01 -05:00
ed03f15644
backport enhancements from v2beta (mlock & RAND_bytes)
2011-12-27 13:42:20 -05:00
b673c72215
fix warnings under visual studio
2011-12-27 13:25:08 -05:00
786292f703
fixes for compilation under os x
2011-12-27 13:00:58 -05:00
5d4ded1850
fix hmac calls on macosx
2011-12-27 12:27:41 -05:00
15118068de
memory locking
2011-12-27 12:15:58 -05:00
a2a54885df
add test for behavior with multiple key operations
2011-12-27 12:14:17 -05:00
f8bf2b1cce
set meaningful test names
2011-12-27 12:01:47 -05:00
823a099e5e
improvements to error handling
2011-12-27 11:30:54 -05:00
0da4a1a5c5
minor cleanups
2011-12-27 11:05:43 -05:00
9f710946ac
explicitly use RAND_bytes per issue #15
2011-12-27 10:35:43 -05:00
5c743489b0
fix type declaration for compilation under vs
2011-12-26 16:02:20 -05:00
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
Stephen Lombardo
Nick Parker