status-im/sqlcipher
1
0
Fork 0
mirror of https://github.com/status-im/sqlcipher.git synced 2026-08-30 22:11:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
404 Commits 14 Branches 44 Tags
Xcode5
Commit Graph
268 Commits
Author SHA1 Message Date
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
Stephen Lombardo f3389d23a2 mutex around RAND_bytes() 2013-07-09 11:30:19 -04:00
Stephen Lombardo 573d7b209d improve initialization and thread safety for default crypto provider 2013-07-09 11:26:40 -04:00
Stephen Lombardo 5827b3d3db Merge branch 'prerelease' into attach 2013-06-27 19:09:42 -04:00
Stephen Lombardo a2bb641e48 64k iterations plus pragma cipher_default_kdf_iter function 2013-06-27 19:07:58 -04:00
Stephen Lombardo 581876802e fix build warnings under VS 2013-06-27 11:01:59 -04:00
Stephen Lombardo 65df5ed290 reflect SQLCipher name on startup 2013-06-22 14:43:38 -04:00
Stephen Lombardo b75c9ffa4b remove unused array allocation 2013-06-21 13:38:08 -04:00
Stephen Lombardo c9ec48ded8 add function to return current registered provider 2013-06-21 11:11:02 -04:00
Stephen Lombardo 51079a8775 resolve build warnings under clang 2013-06-21 11:01:18 -04:00
Nick Parker 1742ee4e5c Check defined for crypto impl flag & formatting 2013-06-12 12:15:13 -05:00
Nick Parker 92cec1ccdd Default crypto provider to OpenSSL 
When no crypto provider has been specified, set the
SQLCIPHER_CRYPTO_OPENSSL flag.
 2013-06-12 10:06:59 -05:00
Stephen Lombardo a828432a72 normalize license statements, ifdefs, and wrapper comments 2013-06-12 11:01:38 -04:00
Nick Parker 8b243d5986 Reorder check for crypto implementation flag. 2013-06-11 12:20:01 -05:00
Stephen Lombardo 91dcae725d if no default provider defined, error with a message 2013-06-11 13:12:02 -04:00
Stephen Lombardo 979f690669 check return code on RAND_bytes(); 2013-06-11 13:11:41 -04:00
Stephen Lombardo 1862c0df6f remove internal calls to add random 2013-06-11 12:55:50 -04:00
Stephen Lombardo b66b1420c3 adjust return values for commoncrypto 2013-06-11 12:53:48 -04:00
Nick Parker 96055def76 Merge branch 'prerelease' into multi-lib 2013-06-11 11:36:10 -05:00
Nick Parker 878f82a09c Fix Vdbe assignment to sqlite3GetVdbe 2013-06-11 11:35:03 -05:00
Nick Parker 51f2855d36 Checking for SQLITE_OK as return code for random 2013-06-11 11:24:29 -05:00
Nick Parker 689b22ead7 Removing RAND_bytes call 2013-06-11 11:23:40 -05:00