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
435 Commits 14 Branches 44 Tags
fafd98ef5d555e286a103ad568caad0bec4d3e2d
Commit Graph
289 Commits
Author SHA1 Message Date
Nick Parker fafd98ef5d Add PRAGMA cipher_profile support 2014-04-07 11:42:32 -05:00
Nick Parker 63f8f9eccc Move invocation of sqlcipher_codec_pragma 2014-04-04 14:31:27 -05:00
Nick Parker 82db0d7e90 Merge sqlite-release(3.8.4.3) into prerelease-integration 
Conflicts:
	Makefile.in
	README
	VERSION
	configure
	manifest
	manifest.uuid
	sqlcipher.1
	src/pragma.c
	src/shell.c
 2014-04-04 13:16:23 -05:00
Nick Parker 6eeedff248 Snapshot of upstream SQLite 3.8.4.3 2014-04-04 10:16:20 -05:00
Nick Parker fb1780bceb Bump cipher version 2013-12-06 11:14:50 -06:00
Nick Parker c5360e120e Nop for adding random to commoncrypto 2013-12-06 11:12:48 -06:00
Nick Parker bba319a716 Fix for cipher_migrate on passphrases longer than 64 characters and raw keys 2013-12-06 11:03:50 -06:00
Nick Parker b03221fc90 Remove unused variable 2013-12-03 13:37:56 -06:00
Nick Parker 200b3146a3 Adjustment to ltc crypto provider and cipher_add_random 2013-12-03 13:32:05 -06:00
Nick Parker 4b31a37006 Enforce prefix and suffix format for cipher_add_random 2013-11-26 09:52:55 -06:00
Nick Parker b5ece46779 Remove ltc_ctx, adjust sqlcipher_ltc_add_random behavior 2013-11-25 17:39:26 -06:00
Nick Parker 8348d8e1ed Fix compilation for Windows 2013-11-25 14:46:26 -06:00
Nick Parker bc058122a8 Static ltc prng state, add partitioned data to prng 2013-11-25 11:52:30 -06:00
Nick Parker 930b441e81 Add PRAGMA cipher_add_random to source external entropy 2013-11-25 10:34:09 -06:00
Nick Parker c7986f2905 Do not use VirtualLock/Unlock on WinRT or Windows Phone 2013-11-04 16:42:32 -06:00
Nick Parker 8338f32f04 Adjust title of cipher_migrate output 2013-10-16 10:24:56 -05:00
Nick Parker bdd8d0a5c6 Change pass field to unsigned char * in cipher_ctx 2013-10-15 10:08:16 -05:00
Nick Parker 035ae3eb17 Fix compiler warnings 2013-10-15 10:08:16 -05:00
Nick Parker 95bb90e33c Merge sqlite-release(3.8.0.2) into prerelease-integration 
Conflicts:
	configure
 2013-10-01 14:36:23 -05:00
Nick Parker 0b3ee4466d Snapshot of upstream SQLite 3.8.0.2 2013-10-01 14:26:57 -05:00
Nick Parker fc2fcff453 Ignore hmac read during Btree file copy 2013-09-23 11:16:12 -05:00
Nick Parker 9d84aca41d Proper format for key on attach, migrate user_version 2013-09-12 09:16:21 -05:00
Stephen Lombardo 018c0fb979 remove unused variables 2013-09-03 17:29:13 -04:00
Stephen Lombardo 16167e9855 restore use of ArraySize convenience function 2013-09-03 16:54:23 -04:00
Stephen Lombardo f2912623bc fix regression itroduced in prior commit 2013-09-03 16:47:11 -04:00
Stephen Lombardo f25510fb98 ANSI C and win c compiler fixes 2013-09-11 16:27:27 -04:00
Nick Parker fd75108661 Merge sqlite-release(3.8.0.1) into prerelease-integration 2013-08-30 16:09:14 -05:00
Nick Parker 679f2be40c Snapshot of upstream SQLite 3.8.0.1 2013-08-30 16:04:26 -05:00
Nick Parker 045844f0cc Adjust codec tracing, add rekey by name test. 2013-08-30 09:49:46 -05:00
Nick Parker 1ba0e0e418 Adjust db_index search count and rename codec_pragma 2013-08-30 08:24:57 -05:00
Nick Parker 20a92abadb Using the _v2 version of key and rekey. 2013-08-29 14:49:37 -05:00
Nick Parker 1f17e15851 Implement sqlite3_key_v2 & sqlite3_rekey_v2. 2013-08-29 11:57:03 -05:00
Nick Parker 432585f0f8 Adjustments due to upstream merging 2013-08-29 09:04:14 -05:00
Nick Parker 897f402696 Merge sqlite-release(3.8.0) into prerelease-integration 
Conflicts:
	configure
	ext/misc/closure.c
	ext/misc/fuzzer.c
	ext/misc/ieee754.c
	ext/misc/nextchar.c
	ext/misc/regexp.c
	ext/misc/spellfix.c
	magic.txt
	src/test_fs.c
	test/backup4.test
	test/btreefault.test
	test/close.test
	test/fts3expr3.test
	test/fts3tok1.test
	test/fts3tok_err.test
	test/incrvacuum3.test
	test/ioerr6.test
	test/orderby1.test
	test/resolver01.test
	test/tkt-7a31705a7e6.test
	test/transitive1.test
	test/whereE.test
	test/whereF.test
 2013-08-29 08:22:50 -05:00
Nick Parker 45915dda5d Snapshot of upstream SQLite 3.8.0 2013-08-29 08:11:18 -05:00
Nick Parker f4eb3b33c6 Bump cipher_version to 3.0.0 2013-08-14 08:20:32 -05:00
Nick Parker cfee6c249c Merge branch 'attach' into kdfiter 
Conflicts:
	test/crypto.test
 2013-08-13 15:27:51 -05:00
Nick Parker 6f4a0f2d8d Adjustments to cipher_migrate 
- And format flags when checking for exit condition
- Pass key size to sqlcipher_check_connection
- Trace version upgrade logic
 2013-08-13 14:53:08 -05:00
Stephen Lombardo c3f6cf1e02 null termination of key value 2013-08-13 12:54:16 -04:00
Nick Parker f844a5dfc3 Attach new codec before btree copy 2013-07-29 11:04:29 -05:00
Nick Parker 9b415f6401 Work to configure the proper env. for the migration 2013-07-26 16:50:36 -05:00
Nick Parker b507d1b180 Clean up compiler warnings 2013-07-26 09:29:36 -05:00
Nick Parker fb14d957ca Swap btree for write, reset password on codec - working. 2013-07-26 09:20:18 -05:00
Nick Parker b92ddfc1ef More work on cipher_migrate, still unusable 2013-07-25 16:22:58 -05:00
Nick Parker 4bc6ba08f8 Initial work on a PRAGMA cipher_migrate 
Swapping of the Btree meta data is not working properly now.
 2013-07-24 17:07:42 -05:00
Stephen Lombardo 6cd1fdf60b finalize new attach behavior 
- key can be specified in hex as key plus salt together
- source passphrase is cleared after derivation
- key specification containing derived key and salt stored on
  cipher_ctx for use in attach on an encrypted main database
  when no key is provided with the attach statement
 2013-07-19 12:50:14 -04:00
Nick Parker 81e487afb7 Merge remote-tracking branch 'origin/prerelease' into kdfiter 2013-07-11 16:21:00 -05:00
Nick Parker 1d3fc78431 Merge branch 'prerelease' into kdfiter 
Conflicts:
	src/crypto_impl.c
 2013-07-11 14:51:09 -05:00
Stephen Lombardo 337eac9fd9 bump cipher_version to 2.2.1 2013-07-10 10:45:44 -04:00
Stephen Lombardo 8866a9f6cf allow -DSQLCIPHER_OPENSSL_NO_MUTEX_RAND to disable openssl rand mutex 2013-07-09 11:57:02 -04:00