297e94d2c2
Merge sqlite-release(3.7.17) into prerelease-integration
...
Conflicts:
src/pragma.c
2013-05-21 15:42:46 -05:00
67300dfce8
Snapshot of upstream SQLite 3.7.17
2013-05-21 15:38:11 -05:00
7d88842525
Snapshot of upstream SQLite 3.7.15.2
2013-01-15 16:38:05 -06:00
a28a2a2309
Merge sqlite-release(3.7.15.2) into prerelease-integration
2013-01-15 16:38:05 -06:00
cf9fb1e077
rev to 2.1.1
2012-12-07 10:56:20 -05:00
bea4a2c894
pragma to query cipher_hmac_pgno setting
2012-11-16 16:16:10 -05:00
ef3ca72e31
pragma to print hmac salt mask
2012-11-16 13:32:03 -05:00
c76596b12d
pragma to return fast_kdf_iter
2012-11-16 12:52:51 -05:00
caf3865b8b
pragmas to override hmac salt mask and allow migration of 2.0 beta databases
2012-11-16 11:13:14 -05:00
9d38ddee10
Merge branch 'prerelease' of ssh://github.com/sqlcipher/sqlcipher into prerelease
2012-11-15 18:49:21 -05:00
58acc8269f
Merge branch 'sqlite-release' into prerelease-int
2012-11-15 18:46:41 -05:00
801e036cd8
upstream 3.7.14.1
2012-11-15 18:45:58 -05:00
45235df3f7
Adding tests for checking the cipher PRAGMA
2012-11-06 12:24:30 -06:00
9c94733fb3
Adding tests for checking initial value and changes to the following
...
PRAGMAs: cipher_use_hmac, cipher_default_use_hmac, kdf_iter, cipher_page_size
2012-11-06 12:17:40 -06:00
48215584ab
bump version to 2.1.0 due to functional change in hmac calculation
2012-07-18 14:50:47 -04:00
aec2fe4efc
Merge branch 'sqlite-release' into prerelease-integration
2012-07-18 14:43:41 -04:00
de4f34b64d
track 3.7.13
2012-07-18 14:42:52 -04:00
971933cd82
remove unecessary copy commands from test
2012-07-18 12:34:32 -04:00
f1ea44e3ef
pragma allows le, be, or native pgno ordering plus tests
2012-07-18 11:21:12 -04:00
cc0e8be7a3
explicit test for opening 2.0 format db with hmac
2012-07-09 23:03:01 -04:00
6dbdd4663c
bump to 2.0.6
2012-06-13 16:27:09 -04:00
2b7a28fd12
tests for large schemas and behavior with auto vacuum enabled
2012-06-13 13:17:17 -04:00
a53d3dee76
Merge branch 'sqlite-release' into relint
2012-05-23 09:26:38 -04:00
35a66a5caa
track 3.7.12.1
2012-05-23 09:26:02 -04:00
ac8385cb14
basic tests for autovacuum
2012-05-18 10:45:41 -04:00
07321926ba
round out rekey tests for WAL
2012-05-18 02:38:25 -04:00
c2f7cd7926
enable secure delete on all encrypted databases
2012-05-18 02:22:40 -04:00
0e8cdf4b25
test for rekey after a large delete
2012-05-17 19:07:57 -04:00
8a734f2219
expand rekey tests
2012-05-17 17:29:01 -04:00
525243c689
Adding PRAGMA cipher_version to identify the current SQLCipher version,
...
also including test.
2012-05-17 07:59:43 -05:00
53c6fc9f5f
Merge branch 'sqlite-release' into release-integration
2012-05-15 19:06:40 -04:00
c8c482ab80
track 3.7.12
2012-05-15 19:05:34 -04:00
aa848ebc08
Merge branch 'release-merge'
2012-02-29 11:39:45 -05:00
8f061f1a50
add pragma cipher_default_use_hmac to toggle global HMAC setting
2012-02-29 11:14:42 -05:00
eb9b65750d
Merge branch 'sqlite-release' into release-merge
2012-01-18 00:19:02 -05:00
d09051a1f2
track 3.7.10
2012-01-18 00:18:26 -05:00
cdfd2a3d3a
ensure that pragmas don't do anything unless a context is initialized on the db
2012-01-18 00:15:01 -05:00
f963c3e48c
test for use of raw key with attached database
2012-01-13 09:51:19 -05:00
1a3e1c793d
tests for vacuum behavior on encrypted databases
2012-01-13 02:10:15 -05:00
f7591e02fe
rework hmac key derivation based on low iteration PBKDF2 with static salt mask
2012-01-12 23:42:55 -05:00
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
2012-01-03 17:26:44 -05:00
a2a54885df
add test for behavior with multiple key operations
2011-12-27 12:14:17 -05:00
f8bf2b1cce
set meaningful test names
2011-12-27 12:01:47 -05:00
522a3d0934
Merge branch 'master' into v2beta
...
Conflicts:
Makefile.in
2011-12-26 15:29:56 -05:00
dea8ae9ace
Merge branch 'sqlite-release' into release-integration
...
Conflicts:
Makefile.in
2011-12-26 15:00:48 -05:00
ddb595fbc9
upstream 3.7.9
2011-12-26 14:52:17 -05:00
efe8c324c5
Merge branch 'v2beta' of github.com:sjlombardo/sqlcipher into v2beta
...
Conflicts:
test/crypto.test
2011-10-12 14:25:36 -04:00
50c0ed42af
SQLC-6: ensure proper behavior of sqlcipher_export() on virtual tables (i.e. FTS3)
2011-08-17 14:15:32 -04:00
56fa635aff
SQLC-1: fix behavior for PRAGMA rekey being called as first operation or before PRAGMA key
2011-08-17 14:00:36 -04:00
648c4e50fe
Merge branch 'sqlite-release' into release-integration
2011-08-17 13:18:08 -04:00
Nick Parker
Stephen Lombardo