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

49 Commits

Author SHA1 Message Date
Stephen Lombardo
62b0deadb5 Merge sqlite-release(3.36.0) into prerelease-integration 2021-10-05 16:41:19 -04:00
Stephen Lombardo
328a4c8437 Snapshot of upstream SQLite 3.36.0 2021-10-05 16:25:47 -04:00
Stephen Lombardo
3399ace246 add new amalgamation_line_macros option missing from configure.ac 2021-08-02 16:49:37 -04:00
Stephen Lombardo
84ecc5f798 remove use of += in configure per issue #382 2021-03-08 10:21:02 -05:00
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
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
Edouard Oger
d211c296e6
NSS crypto implementation 2019-06-27 14:11:33 -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
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
836b4b5108 Adding 'none' option to --with-crypto-lib 
This allows for skipping of the library check, useful when only
preparing the amalgamation.
 2013-06-21 12:19:56 -05:00
Nick Parker
970d88bdb8 Remove SQLCIPHER_CRYPTO_OPENSSL flag for commoncrypto 2013-06-21 10:05:52 -05:00
Nick Parker
be057d3e5f Adjusting the configure template for commoncrypto 2013-06-12 13:45:11 -05:00
Nick Parker
fe9cb18154 commoncrypto integration with configure & register 2013-06-06 12:19:49 -05:00
Nick Parker
50843f0b85 Check crypto library availability by type 2013-06-04 10:13:02 -05: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
Stephen Lombardo
47e8413d24 Merge branch 'deb' into prerelease-int 
Conflicts:
	Makefile.in
	VERSION
	configure
 2013-05-24 16:36:21 -04:00
Stephen Lombardo
cd2c50036b update autoconf to pull automatically use VERSION 2013-03-20 16:38:02 -04:00
Nick Parker
7d88842525 Snapshot of upstream SQLite 3.7.15.2 2013-01-15 16:38:05 -06:00
Stephen Lombardo
226e79762e merge debian patch 2013-01-09 21:14:37 -05:00
Stephen Lombardo
801e036cd8 upstream 3.7.14.1 2012-11-15 18:45:58 -05:00
Stephen Lombardo
c8c482ab80 track 3.7.12 2012-05-15 19:05:34 -04:00
Stephen Lombardo
d09051a1f2 track 3.7.10 2012-01-18 00:18:26 -05:00
Stephen Lombardo
12069ec913 track 3.7.7.1 2011-08-17 13:17:32 -04:00
Stephen Lombardo
fc5fc812f6 track 3.7.5 2011-02-16 16:14:46 -05:00
Stephen Lombardo
92bc32215d track 3.7.2 2010-08-28 08:35:57 -04:00
Stephen Lombardo
7fa21065e9 update to upstream sqlite 3.6.14 2009-05-08 05:27:02 -04:00
Stephen Lombardo
81f606f59f track 3.6.13 2009-04-21 10:39:00 -04:00
Stephen Lombardo
6e36436ed9 track sqlite 3.6.11 2009-02-20 15:33:35 -05: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