Commit Graph

Select branches

Hide Pull Requests

1.1.x

Xcode5

attach

ditto

ditto-4000kdf

kdfiter

master

migrate

multi-lib

prerelease

rekey-hotfix

sqlite-release

update-config-guess

v2.0-stable

1.1.4

2.0.1

v1.1.0

v1.1.1

v1.1.10

v1.1.2

v1.1.3

v1.1.4

v1.1.5

v1.1.6

v1.1.7

v1.1.8

v1.1.9

v2.0.0

v2.0.2_RC2

v2.0.3

v2.0.4_RC1

v2.0.5

v2.0.5_RC1

v2.0.5_RC2

v2.0.6

v2.1.0

v2.1.1

v2.2.0

v2.2.1

v3.0.0

v3.0.1

v3.1.0

v3.2.0

v3.3.0

v3.3.1

v3.4.0

v3.4.1

v3.4.2

v4.0.0

v4.0.1

v4.1.0

v4.2.0

v4.3.0

v4.4.0

v4.4.1

v4.4.2

v4.4.3

v4.5.0

Mono Color

• 0ae6fc9ca8 Fixed up build settings to match ditto branch for successful inclusion in xcode 4.1 projects Billy Gray 2011-09-14 17:05:10 -04:00
• 36bb995e4e avoid having macosx set as the basesdk, thanks xcode Billy Gray 2011-09-14 12:34:28 -04:00
• 2f54f6c55e ignore Xcode 4 personal project files Billy Gray 2011-09-13 10:31:11 -04:00
• 87aca75470 Only build active arch on debug, branch archs setting on SDK to support various architectures Billy Gray 2011-09-13 10:15:05 -04:00
• 22e0566bd6 adjust to support simulator (i386) builds on x86_64 kernel os x lion for xcode 4.1 Billy Gray 2011-09-12 15:20:10 -04:00
• 50c0ed42af SQLC-6: ensure proper behavior of sqlcipher_export() on virtual tables (i.e. FTS3) Stephen Lombardo 2011-08-17 14:15:32 -04:00
• 56fa635aff SQLC-1: fix behavior for PRAGMA rekey being called as first operation or before PRAGMA key Stephen Lombardo 2011-08-17 14:00:36 -04:00
• 3f985f1f47 replace getBoolean to use new sqlite3GetBoolean function Stephen Lombardo 2011-08-17 13:24:33 -04:00
• 648c4e50fe Merge branch 'sqlite-release' into release-integration Stephen Lombardo 2011-08-17 13:18:08 -04:00
• 12069ec913 track 3.7.7.1 Stephen Lombardo 2011-08-17 13:17:32 -04:00
• 4280b29e23 okay, xcode, sure Billy Gray 2011-06-14 17:31:45 -04:00
• ce4fa22a0e Merge branch 'ditto' of https://github.com/sjlombardo/sqlcipher into ditto Billy Gray 2011-06-08 14:09:30 -07:00
• 84c3ee9b64 correct overrides to support uiversal builds Billy Gray 2011-06-08 14:08:34 -07:00
• 55692c9b4e update to export test for large database and FTS3 virtual tables Stephen Lombardo 2011-05-20 22:11:19 -04:00
• 17ade402a3 Adjusting to support 32/64 bit library build and inherit platform from parent project Billy Gray 2011-05-20 14:02:40 -04:00
• 53328715a8 again with the archs setting, turn it back on, 32 bit, things build now Billy Gray 2011-05-20 12:44:33 -04:00
• 542e64b231 drop arch setting in project file Billy Gray 2011-05-12 10:03:04 -04:00
• e6396f9297 cleanup warnings Steven Parkes 2011-05-09 15:31:08 -07:00
• d1af70233a -ansi -pedantic -std=c99 warning clean Steven Parkes 2011-05-09 15:14:17 -07:00
• f1ebbc0d6c add explicit test for WAL journal mode operation Stephen Lombardo 2011-05-08 22:31:37 -04:00
• f5c62a0fd1 Merge branch 'sqlite-release' into integration Stephen Lombardo 2011-05-05 22:39:20 -04:00
• 7cffc8807d track 3.7.6.2 Stephen Lombardo 2011-05-05 22:37:34 -04:00
• 946f363290 remove return on void function Stephen Lombardo 2011-04-17 21:51:41 -04:00
• 92e4ad7436 implementation of sqlcipher_export() function to copy schema and data between databases Stephen Lombardo 2011-04-14 16:44:29 -04:00
• e28cda5cfe Merge branch 'master' into ditto Stephen Lombardo 2011-03-14 16:20:13 -04:00
• 3f834ff2d3 exclude xc4 project files from version control Stephen Lombardo 2011-03-14 16:19:46 -04:00
• 3bebc079a4 Merge branch 'master' into ditto Stephen Lombardo 2011-03-14 12:14:09 -04:00
• df4dc37c34 set SKIP_INSTALL for XC4 compat Stephen Lombardo 2011-03-14 12:13:30 -04:00
• f13ba3d21e set architecture and products at project level, including armv7 Stephen Lombardo 2011-03-12 23:58:13 -05:00
• e0b6d87c2d Merge branch 'master' of github.com:sjlombardo/sqlcipher Stephen Lombardo 2011-03-12 22:40:07 -05:00
• 54fb0db816 Add explicit list of supported platforms and architectures to project build settings for compatibility with XCode 4 Stephen Lombardo 2011-03-12 22:39:18 -05:00
• 76c1e11fe3 refactoring encryption interface so codec interface is separate from crypto implementation Stephen Lombardo 2011-03-02 13:11:00 -05:00
• 7531bed022 allow HMAC behavior override via DEFAULT_USE_HMAC Stephen Lombardo 2011-02-19 14:57:11 -05:00
• ff52bfe0a9 modify crypto-speedtest for HMAC performance comparison Stephen Lombardo 2011-02-19 14:46:33 -05:00
• 9c7104eeb9 fix comments in test suite Stephen Lombardo 2011-02-19 14:45:30 -05:00
• 8cf3ad8e1e add test to verify that you attach and copy from non-hmac database to new format Stephen Lombardo 2011-02-17 16:16:30 -05:00
• dd911f3023 add a test to verify that it is possible to open a 1.1.8 database when changing cipher_use_hmac pragma Stephen Lombardo 2011-02-17 11:50:24 -05:00
• ffcb4f7fd9 refactor calculation of reserve space Stephen Lombardo 2011-02-17 01:49:01 -05:00
• 3aefd5e5de codec_hmac uses hmac key Stephen Lombardo 2011-02-17 00:14:54 -05:00
• f003dfad13 Merge branch 'sqlite-release' into v2-integration Stephen Lombardo 2011-02-16 16:24:07 -05:00
• fc5fc812f6 track 3.7.5 Stephen Lombardo 2011-02-16 16:14:46 -05:00
• b62c74407a improvements to pragmas, allow custom page sizes and page data checks via hmac Stephen Lombardo 2011-02-16 16:06:00 -05:00
• d6d64068d9 clarify build with temp store options Stephen Lombardo 2010-10-12 15:31:27 -07:00
• 0266ddf6be Merge branch 'master' into ditto Stephen Lombardo 2010-10-03 08:56:49 -04:00
• c45622d14d mutexes in rekey v1.1.8 Stephen Lombardo 2010-10-03 08:56:16 -04:00
• a24078d7d6 Merge branch 'master' into ditto Stephen Lombardo 2010-10-03 01:15:21 -04:00
• 658cb02be9 update other areas relying on GetPageSize to use default; Enter db->mutex before forcing page size Stephen Lombardo 2010-10-03 01:14:16 -04:00
• 12aedf2fac Merge branch 'master' into ditto Stephen Lombardo 2010-10-01 13:08:42 -04:00
• a1439c8d71 resolve bug where page size is improperly set Stephen Lombardo 2010-10-01 13:07:37 -04:00
• 470960072c Merge branch 'master' into ditto Stephen Lombardo 2010-09-03 07:46:08 -04:00
• 680e30f229 rename utf.o to utf.lo in Makefile.in to resolve upstream make dependency issue on some platforms v1.1.7 Stephen Lombardo 2010-09-03 07:45:52 -04:00
• 3496247069 Merge branch 'master' into ditto Stephen Lombardo 2010-08-28 08:55:02 -04:00
• 201197adbb minor tweaks to configure / build defines v1.1.6 Stephen Lombardo 2010-08-28 08:52:39 -04:00
• 90f8b72c2d Merge branch 'master' into ditto Stephen Lombardo 2010-08-28 08:50:38 -04:00
• ebecc71a89 accommodate new void return from sqlite3PagerPagecount Stephen Lombardo 2010-08-28 08:44:25 -04:00
• 8a76b73193 Merge branch 'sqlite-release' into integration Stephen Lombardo 2010-08-28 08:38:03 -04:00
• 92bc32215d track 3.7.2 Stephen Lombardo 2010-08-28 08:35:57 -04:00
• 59e8fd2113 change if to ifdef to placate VS Stephen Lombardo 2010-08-28 08:31:38 -04:00
• 977edf436e Merge branch 'master' into ditto Stephen Lombardo 2010-08-22 16:01:06 -04:00
• fe11a8cb66 Merge branch 'sqlite-release' Stephen Lombardo 2010-08-06 23:08:05 -04:00
• 953ca18eb6 track 3.7.0.1 Stephen Lombardo 2010-08-06 23:07:48 -04:00
• 89b4284cf5 Merge branch 'master' into ditto Stephen Lombardo 2010-07-22 09:44:53 -04:00
• 29b781102a Merge branch 'sqlite-release' into integration Stephen Lombardo 2010-07-22 09:23:51 -04:00
• 7b63a4edde track 3.7.0 Stephen Lombardo 2010-07-22 09:16:22 -04:00
• 7c6ac4010e Merge branch 'master' into ditto Stephen Lombardo 2010-06-14 14:22:48 -04:00
• 4f320b6336 thread safe eutex in activate_openssl v1.1.5 Stephen Lombardo 2010-06-09 14:39:25 -04:00
• 900429e356 Merge branch 'master' into ditto Stephen Lombardo 2010-05-18 22:03:01 -04:00
• c0cf162583 explicitly use /usr/bin/gcc to avoid conifgure issues under armv6 builds v1.1.4 1.1.4 Stephen Lombardo 2010-05-18 22:00:28 -04:00
• c2e4ece7e3 Merge branch 'master' into ditto Stephen Lombardo 2010-05-18 12:30:45 -04:00
• 11a0e2bb8f Merge branch 'sqlite-release' into release-integration v1.1.3 Stephen Lombardo 2010-05-18 12:24:16 -04:00
• 4bb256127b update 3.6.23.1 Stephen Lombardo 2010-05-18 12:22:17 -04:00
• 74e43bd423 Merge branch 'master' into ditto Stephen Lombardo 2010-02-25 12:06:43 -05:00
• 43fc841d6a minor fix to readme compile instructions for shared linking v1.1.2 Stephen Lombardo 2010-02-25 11:59:23 -05:00
• c10960834f fix issue where it wasn't possible to ATTACH an unencrypted database Stephen Lombardo 2010-02-25 11:58:56 -05:00
• 445b6d3442 Merge branch 'master' into ditto Stephen Lombardo 2009-12-30 14:52:42 -05:00
• 433a2a6641 force allocation of IV space at end of database pages, even if current cipher doesn't require it (i.e. ECB mode) Stephen Lombardo 2009-12-30 14:52:03 -05:00
• b38a9d20a2 fix initialization of OpenSSL so an encrypted database can be attached to a non-encrypted main database; add test for the same v1.1.1 Stephen Lombardo 2009-12-23 21:45:51 -05:00
• b80464125c Merge branch 'master' into ditto Stephen Lombardo 2009-12-20 23:04:56 -05:00
• 982f416442 add missing sqlite3PageFree and sqlite3PcacheClose to sqlite3PagerClose missed in previous merge v1.1.0 Stephen Lombardo 2009-12-20 00:05:44 -05:00
• 0e55063b10 remove rekey-plaintext test, not supported on master Stephen Lombardo 2009-12-19 16:10:53 -05:00
• 2b97c700e9 Merge branch 'sqlite-release' into integration Stephen Lombardo 2009-12-19 15:58:56 -05:00
• 090d3d3b9b update to 3.6.21 Stephen Lombardo 2009-12-19 15:56:40 -05:00
• c6042bb75f add ditto include directory based on $(DITTO_SRC) to project c flags Stephen Lombardo 2009-12-09 13:02:35 -05:00
• d05405a90e Merge commit 'origin'; branch 'master' into ditto Stephen Lombardo 2009-12-06 14:14:36 -05:00
• c969c4fcfa fixes to please gcc Stephen Lombardo 2009-12-05 20:51:51 -05:00
• fde0756e83 minor cleanup and code changes to please VS.NET compiler unknown 2009-12-06 01:45:54 +00:00
• b66dd49202 patches to allow ditto to be compiled statically Stephen Lombardo 2009-12-05 19:57:48 -05:00
• 063f9cdd2d Merge branch 'sqlite-release' into integration Stephen Lombardo 2009-12-03 16:25:00 -05:00
• 7941e188aa track upstream 3.6.20 Stephen Lombardo 2009-12-03 16:24:07 -05:00
• 75eeefc0bc alter crypto test 1.9 to add several thouand tables to create a schema parse error on improper rekey Stephen Lombardo 2009-08-11 17:57:57 -04:00
• 84e17044df sqlcipher compatibility changes for upstream 3.6.17 Stephen Lombardo 2009-08-11 16:49:37 -04:00
• 1a81194b38 Merge branch 'sqlite-release' into merge-3.6.17 Stephen Lombardo 2009-08-11 16:02:56 -04:00
• db1d641a44 update to upstream sqlite 3.6.17 Stephen Lombardo 2009-08-11 16:01:51 -04:00
• 4c95e61219 properly handle "case 7" journal writes that should be encrypted with the read_key, not the write_key Stephen Lombardo 2009-08-11 12:16:30 -04:00
• 3ce6037365 fix segfault when calling sqlite3_rekey before sqlite3_key - openssl should be initialized on either call Stephen Lombardo 2009-08-11 12:14:19 -04:00
• e47eea5646 Update readme to include additional project information and clarify lack of support for rekeying unencrypted databases Stephen Lombardo 2009-07-09 00:58:58 -04:00
• 135ac7be93 compile with SQLITE_TEMP_STORE=2 to use memory temp store by default Stephen Lombardo 2009-06-23 11:55:26 -04:00
• 0acb34a113 Refactoring to allow algorithm selection and other prameters to be set at runtime Stephen Lombardo 2009-06-04 09:25:20 -04:00
• 06cad3fe22 disable assertions in sqlite3 amalgamation compile flags Stephen Lombardo 2009-05-30 01:04:20 -04:00
• c892464f31 Added XCode static library project Stephen Lombardo 2009-05-28 11:21:47 -04:00