status-im/sqlcipher
2
0
Fork 0
mirror of https://github.com/status-im/sqlcipher.git synced 2025-02-24 09:48:10 +00:00
Code Issues Projects Releases Wiki Activity
227 Commits 14 Branches 44 Tags 45 MiB
Commit Graph

143 Commits

Author SHA1 Message Date
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
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
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
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