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

147 Commits

Author SHA1 Message Date
Nick Parker
c0b9920fa3 Change cipher_version test to match current version 2014-09-30 13:43:13 -05:00
Nick Parker
683a5e7b8e Merge sqlite-release(3.8.6) into prerelease-integration 2014-09-30 08:45:24 -05:00
Nick Parker
0b99d5d75c Snapshot of upstream SQLite 3.8.6 2014-09-30 08:40:45 -05:00
Nick Parker
4e3ffe8c11 Adjust cipher version test 2014-08-18 10:13:07 -05:00
Nick Parker
90606b3d03 Add PRAGMA cipher_store_pass 
PRAGMA cipher_store_pass allows the passphrase to remain in memory
which will allow an ATTACH statement to succeed without providing
the key value during ATTACH when both databases use the same passphrase,
but have different salt values.  Previously, in order to ATTACH with
this scneario, calling ATTACH required providing the key value inline.
 2014-06-13 16:18:02 -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
8d0acdb908 Explicitly close db in tests following cipher_migrate 2013-12-06 11:34:26 -06:00
Nick Parker
8f110848f3 Adjust cipher_version test 2013-12-06 11:33:40 -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
200b3146a3 Adjustment to ltc crypto provider and cipher_add_random 2013-12-03 13:32:05 -06: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
ccb36a07e2 Adjust file size of sqlcipher-3.0-testkey.db to 1 MB 2013-09-23 16:55:46 -05:00
Nick Parker
dac4536bad Bumping file size of sqlcipher-2.0-beta-testkey.db to 1 MB 2013-09-23 16:51:26 -05:00
Nick Parker
85520469e2 Adjust sqlcipher-2.0-be-testkey.db to 1 MB in size 2013-09-23 16:46:34 -05:00
Nick Parker
0add35073b Adjust file size of sqlcipher-2.0-le-testkey.db to over 1 MB 2013-09-23 16:41:34 -05:00
Nick Parker
9ef4eec581 Adjust sqlite3_test_control_pending_byte to test larger files 
- Bump records in 1.1.8 db to increase file size to 1 MB.
 2013-09-23 16:37:04 -05:00
Nick Parker
fc2fcff453 Ignore hmac read during Btree file copy 2013-09-23 11:16:12 -05: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
2cb820717e Add test to key multiple databases with pragma using different keys 2013-08-30 15:48:44 -05:00
Nick Parker
045844f0cc Adjust codec tracing, add rekey by name test. 2013-08-30 09:49:46 -05:00
Nick Parker
480250aa82 Adding test for pragma key on attach 2013-08-30 08:26:18 -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
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
Nick Parker
dce806aae5 Add tests for cipher_migrate 2013-08-12 15:09:11 -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
Stephen Lombardo
337eac9fd9 bump cipher_version to 2.2.1 2013-07-10 10:45:44 -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
Nick Parker
5b639be3c4 Add test for commoncrypto default cipher 2013-06-06 13:49:03 -05:00
Nick Parker
b4bb526dcb New test procedures can check cipher provider name 
if_built_with_openssl and if_built_with_libtomcrypt act as replacements
for do_test, only performing the test when the current sqlcipher
testfixture binary was compiled with the specific crypto library.
 2013-06-05 15:21:21 -05:00
Stephen Lombardo
3703f3638e rework attach to require explicit key 2013-05-24 16:17:15 -04:00
Nick Parker
297e94d2c2 Merge sqlite-release(3.7.17) into prerelease-integration 
Conflicts:
	src/pragma.c
 2013-05-21 15:42:46 -05:00
Nick Parker
67300dfce8 Snapshot of upstream SQLite 3.7.17 2013-05-21 15:38:11 -05:00
Nick Parker
7d88842525 Snapshot of upstream SQLite 3.7.15.2 2013-01-15 16:38:05 -06:00
Nick Parker
a28a2a2309 Merge sqlite-release(3.7.15.2) into prerelease-integration 2013-01-15 16:38:05 -06:00
Stephen Lombardo
cf9fb1e077 rev to 2.1.1 2012-12-07 10:56:20 -05:00
Stephen Lombardo
bea4a2c894 pragma to query cipher_hmac_pgno setting 2012-11-16 16:16:10 -05:00
Stephen Lombardo
ef3ca72e31 pragma to print hmac salt mask 2012-11-16 13:32:03 -05:00
Stephen Lombardo
c76596b12d pragma to return fast_kdf_iter 2012-11-16 12:52:51 -05:00
Stephen Lombardo
caf3865b8b pragmas to override hmac salt mask and allow migration of 2.0 beta databases 2012-11-16 11:13:14 -05:00
Stephen Lombardo
9d38ddee10 Merge branch 'prerelease' of ssh://github.com/sqlcipher/sqlcipher into prerelease 2012-11-15 18:49:21 -05:00
Stephen Lombardo
58acc8269f Merge branch 'sqlite-release' into prerelease-int 2012-11-15 18:46:41 -05:00
Stephen Lombardo
801e036cd8 upstream 3.7.14.1 2012-11-15 18:45:58 -05:00