Commit Graph

56 Commits

Author SHA1 Message Date
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 20d783141f tighten up public functions 2013-05-31 02:18:05 -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
Nick Parker f6e4ed4783 Initial commit with support for using libtomcrypt. 2013-05-31 14:40:12 -05:00
Nick Parker f413acf207 Pull crypto_openssl into Makefile.in for building 2013-05-29 15:10:48 -05:00
Stephen Lombardo 47e8413d24 Merge branch 'deb' into prerelease-int
Conflicts:
	Makefile.in
	VERSION
	configure
2013-05-24 16:36:21 -04:00
Nick Parker 297e94d2c2 Merge sqlite-release(3.7.17) into prerelease-integration
Conflicts:
	src/pragma.c
2013-05-21 15:42:46 -05:00
Nick Parker 67300dfce8 Snapshot of upstream SQLite 3.7.17 2013-05-21 15:38:11 -05:00
Nick Parker 7d88842525 Snapshot of upstream SQLite 3.7.15.2 2013-01-15 16:38:05 -06:00
Nick Parker a28a2a2309 Merge sqlite-release(3.7.15.2) into prerelease-integration 2013-01-15 16:38:05 -06:00
Stephen Lombardo 226e79762e merge debian patch 2013-01-09 21:14:37 -05:00
Stephen Lombardo 58acc8269f Merge branch 'sqlite-release' into prerelease-int 2012-11-15 18:46:41 -05:00
Stephen Lombardo 801e036cd8 upstream 3.7.14.1 2012-11-15 18:45:58 -05:00
Stephen Lombardo aec2fe4efc Merge branch 'sqlite-release' into prerelease-integration 2012-07-18 14:43:41 -04:00
Stephen Lombardo de4f34b64d track 3.7.13 2012-07-18 14:42:52 -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 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 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 680e30f229 rename utf.o to utf.lo in Makefile.in to resolve upstream make dependency issue on some platforms 2010-09-03 07:45:52 -04: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 59ef6e1f46 Updated to fix compatibility with sqlite 3.6.13
- Removed Makefile's inclusion of backup.h (removed from distro)
- update for new sqlite3BtreeSetPageSize iFix parameter
2009-04-21 12:00:30 -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 62b5498cbe modified location of backup.h header to support amalgamated build 2009-02-26 12:35:25 -05:00
Stephen Lombardo e6582238b7 fix missing backup rule in Makefile.in 2009-02-20 17:15:53 -05:00
Stephen Lombardo 4314238203 takes advantage of sqlites new hexkey and hexrekey pragmas
- detect number of key bytes passed in to make decision about whether to hash key
2009-02-20 16:38:27 -05:00