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

101 Commits

Author SHA1 Message Date
Stephen Lombardo
4a459028c5 Merge sqlite-release(3.34.1) into prerelease-integration 2021-02-10 11:46:38 -05:00
Stephen Lombardo
718beb4d42 Snapshot of upstream SQLite 3.34.1 2021-02-10 11:31:51 -05:00
Stephen Lombardo
2efaf9875a Merge sqlite-release(3.33.0) into prerelease-integration 2020-08-17 13:14:21 -04:00
Stephen Lombardo
56e56568ce Snapshot of upstream SQLite 3.33.0 2020-08-17 13:03:40 -04:00
Stephen Lombardo
9e2e049769 minimize a few conflicts with upstream 2020-05-27 17:18:53 -04:00
Stephen Lombardo
b34ab30a4b Merge branch 'sqlite-release' into 5a877221 2020-05-24 07:49:43 -04:00
Stephen Lombardo
5e3132ebe8 Snapshot of upstream SQLite 3.32.0 2020-05-24 07:23:38 -04:00
Stephen Lombardo
ba6367543d reverse SQLite check-in 5a877221 2020-05-13 16:33:13 -04:00
Stephen Lombardo
b8e6e270b1 Merge branch 'sqlite-release' into prerelease-integration 2020-05-13 16:17:29 -04:00
Stephen Lombardo
04c4033c00 Snapshot of upstream SQLite check-in 5a877221 2020-05-13 15:07:50 -04:00
Stephen Lombardo
06467378a3 Merge sqlite-release(3.31.0) into prerelease-integration 2020-04-22 11:30:22 -04:00
Stephen Lombardo
6b86da716e Snapshot of upstream SQLite 3.31.0 2020-04-22 11:11:26 -04:00
Stephen Lombardo
9df3ee334f Merge sqlite-release(3.30.1) into prerelease-integration 2019-10-27 18:31:57 -04:00
Stephen Lombardo
e714766eba Snapshot of upstream SQLite 3.30.1 2019-10-27 18:21:41 -04:00
Stephen Lombardo
cf5ec544d2 Merge sqlite-release(3.29.0) into prerelease-integration 2019-09-25 12:13:27 -04:00
Stephen Lombardo
400c015f3f Snapshot of upstream SQLite 3.29.0 2019-09-25 10:27:57 -04:00
Edouard Oger
d211c296e6
NSS crypto implementation 2019-06-27 14:11:33 -04:00
Stephen Lombardo
6158146e65 Merge sqlite-release(3.28.0) into prerelease-integration 2019-05-15 12:58:11 -04:00
Stephen Lombardo
801ae64881 Snapshot of upstream SQLite 3.28.0 2019-05-15 12:49:41 -04:00
Stephen Lombardo
c22eaf85ed Merge sqlite-release(3.27.1) into prerelease-integration 2019-02-10 10:44:20 -05:00
Stephen Lombardo
4745d8a485 Snapshot of upstream SQLite 3.27.1 2019-02-10 10:35:42 -05:00
Stephen Lombardo
bd2f337070 Merge sqlite-release(3.26.0) into prerelease-integration 2018-12-12 20:17:24 -05:00
Stephen Lombardo
4d9565b805 Snapshot of upstream SQLite 3.26.0 2018-12-12 19:43:10 -05:00
Stephen Lombardo
532f48f7f1 Merge sqlite-release(3.25.2) into prerelease-integration 2018-09-28 14:57:11 -04:00
Stephen Lombardo
e62fa4945b Snapshot of upstream SQLite 3.25.2 2018-09-28 14:35:21 -04:00
Stephen Lombardo
e3c5fecbe1 Merge sqlite-release(3.25.0) into prerelease-integration 2018-09-18 12:55:53 -04:00
Stephen Lombardo
bf3fa86130 Snapshot of upstream SQLite 3.25.0 2018-09-18 12:31:37 -04:00
Nick Parker
be789e94dd Merge sqlite-release(3.20.1) into prerelease-integration 2017-09-27 16:12:26 -05:00
Nick Parker
1f3bc22483 Snapshot of upstream SQLite 3.20.1 2017-09-27 16:07:03 -05:00
Nick Parker
bae72ae4e3 Merge sqlite-release(3.15.2) into prerelease-integration 2016-12-06 13:10:27 -06:00
Nick Parker
51ec837e61 Snapshot of upstream SQLite 3.15.2 2016-12-05 14:29:15 -06:00
Nick Parker
1dd36b8384 Merge remote-tracking branch 'origin/sqlite-release' into prerelease-integration 2016-12-05 14:09:57 -06:00
Nick Parker
5958df7f25 Revert "Merge sqlite-release(3.11.0) into prerelease-integration" 
This reverts commit 3550fb400a17bb440a5fbea59da6abf8a318b095, reversing
changes made to 4c87a22299b8a6165b6ab9bae8b927f5c7d761ac.
 2016-12-02 16:24:56 -06:00
Nick Parker
9644b9fe85 Snapshot of upstream SQLite 3.11.0 2016-02-23 09:07:39 -06:00
Nick Parker
3550fb400a Merge sqlite-release(3.11.0) into prerelease-integration 2016-02-22 11:20:06 -06:00
Nick Parker
376eb11e20 Snapshot of upstream SQLite 3.11.0 2016-02-22 10:40:43 -06:00
Nick Parker
595ef07930 Merge sqlite-release(3.8.10.2) into prerelease-integration 2015-07-10 14:30:07 -05:00
Nick Parker
724d1aac99 Snapshot of upstream SQLite 3.8.10.2 2015-07-10 14:14:29 -05:00
Nick Parker
edf2c86154 Merge sqlite-release(3.8.8.3) into prerelease-integration 2015-03-20 09:37:39 -05:00
Nick Parker
d4954191b9 Snapshot of upstream SQLite 3.8.8.3 2015-03-20 09:04:26 -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
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
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
Stephen Lombardo
35b4d9a425 initial implementation of CommonCrypto provider 2013-06-05 13:43:08 -04:00
Stephen Lombardo
5296f3334b fixup build to include new sqlcipher.h 2013-05-31 02:40:08 -04:00
Stephen Lombardo
c7f1d14ded providers accessed via function pointers 2013-05-31 00:52:19 -04:00
Nick Parker
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