status-im/sqlcipher
1
0
Fork 0
mirror of https://github.com/status-im/sqlcipher.git synced 2026-08-31 06:21:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
215 Commits 14 Branches 44 Tags
1a935545bb2b4e652ed1f6c192ca7dae137f61b3
Commit Graph
135 Commits
Author SHA1 Message Date
Stephen Lombardo 1fdb22fb8c Merge branch 'master' into ditto 2012-02-29 12:02:55 -05: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
Billy Gray 0dc7a372dd minor merge conflict resolved 
Merge branch 'master' into ditto

Conflicts:
	src/func.c
 2012-02-02 14:53:53 -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 2e868032dc.
 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 cb5a77187d Revert "remove the customizations that were merged in with the project file changes we made on the ditto branch" 
Doing this to restore Ditto includes on our down-stream branch.

Note: no changes should be made to this branch for up-stream merging!

This reverts commit ff64398d84.
 2011-10-12 15:36:51 -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 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 0266ddf6be Merge branch 'master' into ditto 2010-10-03 08:56:49 -04:00
Stephen Lombardo c45622d14d mutexes in rekey 2010-10-03 08:56:16 -04:00
Stephen Lombardo a24078d7d6 Merge branch 'master' into ditto 2010-10-03 01:15:21 -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 12aedf2fac Merge branch 'master' into ditto 2010-10-01 13:08:42 -04:00