Commit Graph

544 Commits

Author SHA1 Message Date
Nick Parker df092f0a7a Update changelog 2016-12-28 11:39:09 -06:00
Nick Parker 5f00cf1df0 Update cipher_version test to 3.4.1 2016-12-22 09:42:16 -06:00
Nick Parker 52ba939f78 Default page size to 1024 2016-12-22 09:42:16 -06:00
Stephen Lombardo 3f990b42f3 Merge branch 'master' into prerelease 2016-12-13 15:11:55 -05:00
Nick Parker d49f59aa87 Bump version to 3.4.1 2016-12-09 12:25:48 -06:00
Nick Parker 26ac02ed18 Adjust path to test databases for tests 2016-12-09 11:50:14 -06:00
Nick Parker 939c83a007 Support OpenSSL 1.1.0 and prior 2016-12-09 11:47:39 -06: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 3550fb400a, reversing
changes made to 4c87a22299.
2016-12-02 16:24:56 -06:00
Nick Parker 6fec5c62c4 Reset OpenSSL external init flag during deactivate 2016-11-09 10:15:40 -06:00
Nick Parker 35aa9e0968 Add check for SQLITE_OS_WINRT for fopen_s usage 2016-06-14 09:21:41 -05:00
Nick Parker a11341d185 Use append mode, and fopen_s when applicable for cipher_profile 2016-05-26 10:54:02 -05:00
Nick Parker 714bff612b Revert "Adjust cipher_profile to utilize VFS"
This reverts commit 92ce3368d7.
2016-05-25 16:38:08 -05:00
Nick Parker c1f7fe783c Prevent writing database with cipher set to invalid value 2016-05-25 16:37:54 -05:00
Nick Parker 92ce3368d7 Adjust cipher_profile to utilize VFS 2016-05-25 11:23:17 -05:00
Nick Parker e873a49d99 Prevent deadlock of database mutex 2016-05-13 16:28:34 -05:00
Nick Parker d7120d73b4 Link to SQLite in README 2016-05-09 16:21:31 -05:00
Nick Parker ebcae49d1b More README cleanup 2016-05-09 16:07:10 -05:00
Nick Parker a8906c44cf Clean up README 2016-05-09 16:03:57 -05:00
Nick Parker 0edd41b6d5 Fix assertion in cc provider 2016-04-19 09:11:34 -05:00
Nick Parker 910fd70a3f Merge branch 'prerelease' 2016-04-05 08:21:13 -05:00
Nick Parker e4112a5782 Set date to 3.4.0 release in changelog 2016-04-05 08:19:19 -05:00
Nick Parker 85a407e259 Move declaration to top level of block 2016-03-07 14:35:07 -06:00
Nick Parker 586515f39e Merge branch 'prerelease' for 3.4.0 release 2016-03-03 11:34:18 -06:00
Nick Parker 3cbf645b22 Update changelog references deprecated PRAGMA cipher command 2016-03-03 11:32:44 -06:00
Nick Parker bc9fda6b26 Issue warning for deprecated PRAGMA cipher command 2016-03-03 11:23:11 -06:00
Nick Parker ac840a9ae0 Initial contributing, issue, and pull request template for Github 2016-02-24 15:40:16 -06:00
Nick Parker 2d13dfcfd5 Merge branch 'eighthave-prerelease' into prerelease 2016-02-24 15:07:50 -06:00
Nick Parker 0cb5df75a1 Merge branch 'master' of https://github.com/eighthave/sqlcipher into eighthave-prerelease 2016-02-24 15:06:56 -06:00
Nick Parker 12ae0e57dd Bump cipher_version to 3.4.0 2016-02-24 14:40:12 -06:00
Nick Parker 39e07984e5 Prepare changelog for 3.4.0 release 2016-02-24 14:38:23 -06:00
Nick Parker 9644b9fe85 Snapshot of upstream SQLite 3.11.0 2016-02-23 09:07:39 -06:00
Nick Parker f9044bf604 Initial reporting of the cipher provider version
Execute PRAGMA cipher_provider_version;

Supports OpenSSL, libtomcrypt, and
common crypto when running on OS X
2016-02-22 15:53:08 -06:00
Nick Parker cbcb03710a Pass flag to sqlite3PagerGet 2016-02-22 12:39:29 -06:00
Nick Parker ff730e50d3 Update from autoreconf 2016-02-22 12:38:50 -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 4c87a22299 Merge branch 'Sc00bz-patch-1' into prerelease 2016-01-27 13:35:05 -06:00
Steve Thomas a5d41bf0ad Validate Hex 2016-01-27 10:59:39 -06:00
Steve Thomas f556390462 Added cipher_isHex() 2016-01-27 10:53:24 -06:00
Stephen Lombardo 4216a5f245 Merge branch 'cnoon-feature/xcode_frameworks' into prerelease 2015-12-03 10:11:43 -05:00
Christian Noon f4595d3e5f Fixed build related issues with included files and umbrella header.
Resolved the following:

- Added sqlite3.h to the project to be copied in framework bundle
- Added sqlite3.c to all the framework targets to be compiled
- Added sqlite3.h to umbrella header
- Added clang warning suppression to compile without warnings
2015-11-17 22:10:00 -08:00
Christian Noon 09b03f1646 Updated buildable name in watchOS scheme to latest version. 2015-11-17 21:28:53 -08:00
Christian Noon 1372da7f60 Created a new watchOS framework target supporting watchOS 2.0+. 2015-11-17 21:09:56 -08:00
Christian Noon 71691b6a1c Created a new tvOS framework target supporting tvOS 9.0+. 2015-11-17 21:03:22 -08:00
Christian Noon a2d461cd6d Added a new OSX framework target for OS X 10.9+. 2015-11-17 20:57:18 -08:00
Christian Noon 8554c8577f Created a new SQLCipher framework target for iOS 8.0+. 2015-11-17 20:50:22 -08:00
Nick Parker c01b94fb6a Merge branch 'prerelease' 2015-07-13 11:58:23 -05:00