5f00cf1df0
Update cipher_version test to 3.4.1
2016-12-22 09:42:16 -06:00
26ac02ed18
Adjust path to test databases for tests
2016-12-09 11:50:14 -06:00
bae72ae4e3
Merge sqlite-release(3.15.2) into prerelease-integration
2016-12-06 13:10:27 -06:00
51ec837e61
Snapshot of upstream SQLite 3.15.2
2016-12-05 14:29:15 -06:00
1dd36b8384
Merge remote-tracking branch 'origin/sqlite-release' into prerelease-integration
2016-12-05 14:09:57 -06:00
5958df7f25
Revert "Merge sqlite-release(3.11.0) into prerelease-integration"
...
This reverts commit 3550fb400a4c87a22299
2016-12-02 16:24:56 -06:00
c1f7fe783c
Prevent writing database with cipher set to invalid value
2016-05-25 16:37:54 -05:00
9644b9fe85
Snapshot of upstream SQLite 3.11.0
2016-02-23 09:07:39 -06:00
3550fb400a
Merge sqlite-release(3.11.0) into prerelease-integration
2016-02-22 11:20:06 -06:00
376eb11e20
Snapshot of upstream SQLite 3.11.0
2016-02-22 10:40:43 -06:00
d1e1e72fb0
Adjust cipher_version test for 3.3.1 release
2015-07-13 11:58:18 -05:00
595ef07930
Merge sqlite-release(3.8.10.2) into prerelease-integration
2015-07-10 14:30:07 -05:00
724d1aac99
Snapshot of upstream SQLite 3.8.10.2
2015-07-10 14:14:29 -05:00
18f95ebbea
Check for valid context before using cipher_store_pass
...
Identified by Nicholas Starke
2015-04-21 14:08:41 -05:00
c14afcf742
Prevent segfault when invalid cipher name provided, identified by Nicholas Starke
2015-04-16 08:57:29 -05:00
4677f474b1
Bump cipher_version value in test
2015-03-20 10:49:35 -05:00
edf2c86154
Merge sqlite-release(3.8.8.3) into prerelease-integration
2015-03-20 09:37:39 -05:00
d4954191b9
Snapshot of upstream SQLite 3.8.8.3
2015-03-20 09:04:26 -05:00
a31d65d7c8
Add support for attaching databases with non-default page sizes
2015-01-29 10:39:12 -06:00
c0b9920fa3
Change cipher_version test to match current version
2014-09-30 13:43:13 -05:00
683a5e7b8e
Merge sqlite-release(3.8.6) into prerelease-integration
2014-09-30 08:45:24 -05:00
0b99d5d75c
Snapshot of upstream SQLite 3.8.6
2014-09-30 08:40:45 -05:00
4e3ffe8c11
Adjust cipher version test
2014-08-18 10:13:07 -05:00
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
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
6eeedff248
Snapshot of upstream SQLite 3.8.4.3
2014-04-04 10:16:20 -05:00
8d0acdb908
Explicitly close db in tests following cipher_migrate
2013-12-06 11:34:26 -06:00
8f110848f3
Adjust cipher_version test
2013-12-06 11:33:40 -06:00
bba319a716
Fix for cipher_migrate on passphrases longer than 64 characters and raw keys
2013-12-06 11:03:50 -06:00
200b3146a3
Adjustment to ltc crypto provider and cipher_add_random
2013-12-03 13:32:05 -06:00
95bb90e33c
Merge sqlite-release(3.8.0.2) into prerelease-integration
...
Conflicts:
configure
2013-10-01 14:36:23 -05:00
0b3ee4466d
Snapshot of upstream SQLite 3.8.0.2
2013-10-01 14:26:57 -05:00
ccb36a07e2
Adjust file size of sqlcipher-3.0-testkey.db to 1 MB
2013-09-23 16:55:46 -05:00
dac4536bad
Bumping file size of sqlcipher-2.0-beta-testkey.db to 1 MB
2013-09-23 16:51:26 -05:00
85520469e2
Adjust sqlcipher-2.0-be-testkey.db to 1 MB in size
2013-09-23 16:46:34 -05:00
0add35073b
Adjust file size of sqlcipher-2.0-le-testkey.db to over 1 MB
2013-09-23 16:41:34 -05:00
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
fc2fcff453
Ignore hmac read during Btree file copy
2013-09-23 11:16:12 -05:00
fd75108661
Merge sqlite-release(3.8.0.1) into prerelease-integration
2013-08-30 16:09:14 -05:00
679f2be40c
Snapshot of upstream SQLite 3.8.0.1
2013-08-30 16:04:26 -05:00
2cb820717e
Add test to key multiple databases with pragma using different keys
2013-08-30 15:48:44 -05:00
045844f0cc
Adjust codec tracing, add rekey by name test.
2013-08-30 09:49:46 -05:00
480250aa82
Adding test for pragma key on attach
2013-08-30 08:26:18 -05:00
432585f0f8
Adjustments due to upstream merging
2013-08-29 09:04:14 -05:00
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
45915dda5d
Snapshot of upstream SQLite 3.8.0
2013-08-29 08:11:18 -05:00
cfee6c249c
Merge branch 'attach' into kdfiter
...
Conflicts:
test/crypto.test
2013-08-13 15:27:51 -05:00
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
dce806aae5
Add tests for cipher_migrate
2013-08-12 15:09:11 -05:00
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
Stephen Lombardo