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

91 Commits

Author SHA1 Message Date
Stephen Lombardo
3f81bbc668 Merge branch 'master' of github.com:sqlcipher/sqlcipher 2012-05-17 12:35:59 -04:00
Stephen Lombardo
53c6fc9f5f Merge branch 'sqlite-release' into release-integration 2012-05-15 19:06:40 -04:00
Stephen Lombardo
c8c482ab80 track 3.7.12 2012-05-15 19:05:34 -04:00
Stephen Lombardo
b6302e30a2 disable key initialization on the no-encryption speed test 2012-05-07 11:05:22 -04:00
Stephen Lombardo
eb9b65750d Merge branch 'sqlite-release' into release-merge 2012-01-18 00:19:02 -05:00
Stephen Lombardo
d09051a1f2 track 3.7.10 2012-01-18 00:18:26 -05:00
Stephen Lombardo
522a3d0934 Merge branch 'master' into v2beta 
Conflicts:
	Makefile.in
 2011-12-26 15:29:56 -05:00
Stephen Lombardo
dea8ae9ace Merge branch 'sqlite-release' into release-integration 
Conflicts:
	Makefile.in
 2011-12-26 15:00:48 -05:00
Stephen Lombardo
ddb595fbc9 upstream 3.7.9 2011-12-26 14:52:17 -05:00
Stephen Lombardo
648c4e50fe Merge branch 'sqlite-release' into release-integration 2011-08-17 13:18:08 -04:00
Stephen Lombardo
12069ec913 track 3.7.7.1 2011-08-17 13:17:32 -04:00
Stephen Lombardo
f5c62a0fd1 Merge branch 'sqlite-release' into integration 2011-05-05 22:39:20 -04:00
Stephen Lombardo
7cffc8807d track 3.7.6.2 2011-05-05 22:37:34 -04:00
Stephen Lombardo
76c1e11fe3 refactoring encryption interface so codec interface is separate from crypto implementation 2011-03-02 13:15:13 -05:00
Stephen Lombardo
ff52bfe0a9 modify crypto-speedtest for HMAC performance comparison 2011-02-19 14:46:33 -05:00
Stephen Lombardo
f003dfad13 Merge branch 'sqlite-release' into v2-integration 
Conflicts:
	Makefile.in
 2011-02-16 16:24:07 -05:00
Stephen Lombardo
fc5fc812f6 track 3.7.5 2011-02-16 16:14:46 -05:00
Stephen Lombardo
8a76b73193 Merge branch 'sqlite-release' into integration 2010-08-28 08:38:03 -04:00
Stephen Lombardo
92bc32215d track 3.7.2 2010-08-28 08:35:57 -04:00
Stephen Lombardo
29b781102a Merge branch 'sqlite-release' into integration 
Conflicts:
	Makefile.in
	test/quick.test
 2010-07-22 09:23:51 -04:00
Stephen Lombardo
7b63a4edde track 3.7.0 2010-07-22 09:16:22 -04:00
Stephen Lombardo
11a0e2bb8f Merge branch 'sqlite-release' into release-integration 2010-05-18 12:24:16 -04:00
Stephen Lombardo
4bb256127b update 3.6.23.1 2010-05-18 12:22:17 -04:00
Stephen Lombardo
2b97c700e9 Merge branch 'sqlite-release' into integration 
Conflicts:
	Makefile.in
 2009-12-19 15:58:56 -05:00
Stephen Lombardo
090d3d3b9b update to 3.6.21 2009-12-19 15:56:40 -05:00
Stephen Lombardo
063f9cdd2d Merge branch 'sqlite-release' into integration 2009-12-03 16:25:00 -05:00
Stephen Lombardo
7941e188aa track upstream 3.6.20 2009-12-03 16:24:07 -05:00
Stephen Lombardo
1a81194b38 Merge branch 'sqlite-release' into merge-3.6.17 2009-08-11 16:02:56 -04:00
Stephen Lombardo
db1d641a44 update to upstream sqlite 3.6.17 2009-08-11 16:01:51 -04:00
Stephen Lombardo
fee0308d2b Merge branch 'sqlite-release' 2009-05-08 05:27:46 -04:00
Stephen Lombardo
7fa21065e9 update to upstream sqlite 3.6.14 2009-05-08 05:27:02 -04:00
Stephen Lombardo
6737773707 Merge branch 'sqlite-release' 2009-04-21 10:50:03 -04:00
Stephen Lombardo
81f606f59f track 3.6.13 2009-04-21 10:39:00 -04:00
Stephen Lombardo
7b9260a6e9 renamed codec.* to crypto.* for clarity 2009-02-20 17:26:13 -05:00
Stephen Lombardo
cbbb7b2a89 Merge branch 'sqlite-release' 
Conflicts:

	Makefile.in
	src/pager.c
	src/pragma.c
	tool/mksqlite3c.tcl
 2009-02-20 15:52:39 -05:00
Stephen Lombardo
6e36436ed9 track sqlite 3.6.11 2009-02-20 15:33:35 -05:00
Stephen Lombardo
88e6a2edf8 support amalgamated builds 2009-02-19 13:09:17 -05:00
Stephen Lombardo
d85be36fd7 more fixes to licensing of code 2008-11-30 13:59:21 -05:00
Stephen Lombardo
b7979aa5da added simple speed comparison test based on tool/speedtest.tcl 2008-09-11 01:48:24 -04:00
Stephen Lombardo
2893a5d0b2 update baseline to sqlite version 3.6.1 2008-08-19 01:05:45 -04:00
Stephen Lombardo
617ed01e77 commit of sqlite 3.6.0 2008-07-30 09:15:43 -04:00