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
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
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
35b4d9a425
initial implementation of CommonCrypto provider
2013-06-05 13:43:08 -04:00
5296f3334b
fixup build to include new sqlcipher.h
2013-05-31 02:40:08 -04:00
c7f1d14ded
providers accessed via function pointers
2013-05-31 00:52:19 -04:00
e44f59f2b3
Add support for --with-crypto-lib from autoconf
...
The default configure script generated from autoconf will default to
using OpenSSL as the crypto library. With the new --with-crypto-lib
flag, users can specify libtomcrypto as an alternative crypto library.
2013-06-03 16:45:44 -05:00
f6e4ed4783
Initial commit with support for using libtomcrypt.
2013-05-31 14:40:12 -05:00
f413acf207
Pull crypto_openssl into Makefile.in for building
2013-05-29 15:10:48 -05:00
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
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
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
3f81bbc668
Merge branch 'master' of github.com:sqlcipher/sqlcipher
2012-05-17 12:35:59 -04: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
b6302e30a2
disable key initialization on the no-encryption speed test
2012-05-07 11:05:22 -04: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
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
648c4e50fe
Merge branch 'sqlite-release' into release-integration
2011-08-17 13:18:08 -04:00
12069ec913
track 3.7.7.1
2011-08-17 13:17:32 -04:00
f5c62a0fd1
Merge branch 'sqlite-release' into integration
2011-05-05 22:39:20 -04:00
7cffc8807d
track 3.7.6.2
2011-05-05 22:37:34 -04:00
76c1e11fe3
refactoring encryption interface so codec interface is separate from crypto implementation
2011-03-02 13:15:13 -05:00
ff52bfe0a9
modify crypto-speedtest for HMAC performance comparison
2011-02-19 14:46:33 -05:00
f003dfad13
Merge branch 'sqlite-release' into v2-integration
...
Conflicts:
Makefile.in
2011-02-16 16:24:07 -05:00
fc5fc812f6
track 3.7.5
2011-02-16 16:14:46 -05:00
8a76b73193
Merge branch 'sqlite-release' into integration
2010-08-28 08:38:03 -04:00
92bc32215d
track 3.7.2
2010-08-28 08:35:57 -04:00
29b781102a
Merge branch 'sqlite-release' into integration
...
Conflicts:
Makefile.in
test/quick.test
2010-07-22 09:23:51 -04:00
7b63a4edde
track 3.7.0
2010-07-22 09:16:22 -04:00
11a0e2bb8f
Merge branch 'sqlite-release' into release-integration
2010-05-18 12:24:16 -04:00
4bb256127b
update 3.6.23.1
2010-05-18 12:22:17 -04:00
2b97c700e9
Merge branch 'sqlite-release' into integration
...
Conflicts:
Makefile.in
2009-12-19 15:58:56 -05:00
090d3d3b9b
update to 3.6.21
2009-12-19 15:56:40 -05:00
063f9cdd2d
Merge branch 'sqlite-release' into integration
2009-12-03 16:25:00 -05:00
7941e188aa
track upstream 3.6.20
2009-12-03 16:24:07 -05:00
1a81194b38
Merge branch 'sqlite-release' into merge-3.6.17
2009-08-11 16:02:56 -04:00
db1d641a44
update to upstream sqlite 3.6.17
2009-08-11 16:01:51 -04:00
fee0308d2b
Merge branch 'sqlite-release'
2009-05-08 05:27:46 -04:00
Nick Parker
Stephen Lombardo