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
458 Commits 14 Branches 44 Tags 45 MiB
Commit Graph

458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Lombardo
b6302e30a2 disable key initialization on the no-encryption speed test 2012-05-07 11:05:22 -04:00
Stephen Lombardo
885ffa94a4 update xcode project file to set -mno-thumb for armv6 only v2.0.4_RC1 2012-02-29 11:56:30 -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
Stephen Lombardo
ff9a340039 add -mno-thumb cflag to avoid armv6 crash v2.0.3 2012-01-25 01:17:51 -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
75f060efa7 add a prominent LICENSE file (to help make sure terms are clear) v2.0.2_RC2 2012-01-13 14:04: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
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
2.0.1 		2012-01-03 17:26:44 -05:00
Stephen Lombardo
0d1e81061d Merge branch 'master' into v2beta 
Conflicts:
	src/crypto.c
v2.0.0 		2012-01-03 11:17:36 -05:00
Stephen Lombardo
640cd85a5d move EVP_CIPHER_CTX to locked heap memory v1.1.9 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