Stephen Lombardo
f963c3e48c
test for use of raw key with attached database
2012-01-13 09:51:19 -05:00
Stephen Lombardo
1a3e1c793d
tests for vacuum behavior on encrypted databases
2012-01-13 02:10:15 -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
0d1e81061d
Merge branch 'master' into v2beta
...
Conflicts:
src/crypto.c
2012-01-03 11:17:36 -05:00
Stephen Lombardo
640cd85a5d
move EVP_CIPHER_CTX to locked heap memory
2012-01-03 11:16:05 -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
6c2c80fce0
Merge branch 'master' into v2beta
2011-12-28 11:40:15 -05:00
Stephen Lombardo
12ed2a3228
long overdue updates to the README file
2011-12-28 11:39:50 -05:00
Stephen Lombardo
95049844a8
add notice
2011-12-28 11:20:02 -05:00
Stephen Lombardo
60e618032c
Merge branch 'master' into v2beta
...
Conflicts:
src/crypto.c
2011-12-28 11:06:01 -05:00
Stephen Lombardo
ed03f15644
backport enhancements from v2beta (mlock & RAND_bytes)
2011-12-27 13:42:20 -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
a2a54885df
add test for behavior with multiple key operations
2011-12-27 12:14:17 -05:00
Stephen Lombardo
f8bf2b1cce
set meaningful test names
2011-12-27 12:01:47 -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
Stephen Lombardo
5c743489b0
fix type declaration for compilation under vs
2011-12-26 16:02:20 -05:00
Stephen Lombardo
522a3d0934
Merge branch 'master' into v2beta
...
Conflicts:
Makefile.in
2011-12-26 15:29:56 -05:00
Stephen Lombardo
dea8ae9ace
Merge branch 'sqlite-release' into release-integration
...
Conflicts:
Makefile.in
2011-12-26 15:00:48 -05:00
Stephen Lombardo
ddb595fbc9
upstream 3.7.9
2011-12-26 14:52:17 -05:00
Stephen Lombardo
3e4eacddd7
Merge branch 'master' of github.com:sjlombardo/sqlcipher into v2beta
2011-10-27 10:47:30 -04:00
Billy Gray
6b55a5170b
project file modernization by Xcode 4.2
2011-10-14 16:42:02 -04:00
Billy Gray
591316cb64
Merge branch 'master' into v2beta
...
Conflicts:
sqlcipher.xcodeproj/project.pbxproj
2011-10-12 15:46:53 -04:00
Billy Gray
ff64398d84
remove the customizations that were merged in with the project file changes we made on the ditto branch
2011-10-12 15:31:42 -04:00
Stephen Lombardo
efe8c324c5
Merge branch 'v2beta' of github.com:sjlombardo/sqlcipher into v2beta
...
Conflicts:
test/crypto.test
2011-10-12 14:25:36 -04:00
Billy Gray
1d437e4121
add -DSQLITE_THREADSAFE to CFLAGS
2011-09-27 17:44:33 -04:00
Billy Gray
0ae6fc9ca8
Fixed up build settings to match ditto branch for successful inclusion in xcode 4.1 projects
2011-09-14 17:05:10 -04:00
Billy Gray
36bb995e4e
avoid having macosx set as the basesdk, thanks xcode
2011-09-14 12:34:28 -04:00
Billy Gray
2f54f6c55e
ignore Xcode 4 personal project files
2011-09-13 10:31:11 -04:00
Billy Gray
87aca75470
Only build active arch on debug, branch archs setting on SDK to support various architectures
2011-09-13 10:15:05 -04:00
Billy Gray
22e0566bd6
adjust to support simulator (i386) builds on x86_64 kernel os x lion for xcode 4.1
2011-09-12 15:20:10 -04:00
Stephen Lombardo
50c0ed42af
SQLC-6: ensure proper behavior of sqlcipher_export() on virtual tables (i.e. FTS3)
2011-08-17 14:15:32 -04:00
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
Billy Gray
4280b29e23
okay, xcode, sure
2011-06-14 17:31:45 -04:00
Billy Gray
ce4fa22a0e
Merge branch 'ditto' of https://github.com/sjlombardo/sqlcipher into ditto
...
Conflicts:
sqlcipher.xcodeproj/project.pbxproj
2011-06-08 14:09:30 -07:00
Billy Gray
84c3ee9b64
correct overrides to support uiversal builds
2011-06-08 14:08:34 -07:00
Stephen Lombardo
55692c9b4e
update to export test for large database and FTS3 virtual tables
2011-05-20 22:11:19 -04:00
Billy Gray
17ade402a3
Adjusting to support 32/64 bit library build and inherit platform from parent project
2011-05-20 14:02:40 -04:00
Billy Gray
53328715a8
again with the archs setting, turn it back on, 32 bit, things build now
2011-05-20 12:44:33 -04:00
Billy Gray
542e64b231
drop arch setting in project file
2011-05-12 10:03:04 -04:00
Steven Parkes
e6396f9297
cleanup warnings
2011-05-09 15:31:27 -07:00
