Commit Graph

496 Commits

Author SHA1 Message Date
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
Nick Parker d1e1e72fb0 Adjust cipher_version test for 3.3.1 release 2015-07-13 11:58:18 -05:00
Nick Parker 020b6e2caf Merge branch 'prerelease' 2015-07-13 11:54:57 -05:00
Nick Parker b69e1d36be Rebuild configure to work properly with libtool 2015-07-13 11:54:42 -05:00
Nick Parker 6737dca1bc Fix link for 3.3.1 release 2015-07-13 10:35:55 -05:00
Nick Parker 951d2ed667 Add release notes for 3.3.1 2015-07-13 10:23:35 -05:00
Nick Parker fcdbd38304 Merge branch 'prerelease' for 3.3.1 release 2015-07-13 10:09:55 -05:00
Nick Parker e91f2211b7 Bump cipher version to 3.3.1 2015-07-13 09:53:10 -05: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 e451540b9c Remove null check, assignment always occurs 2015-06-17 11:57:43 -05:00
Nick Parker b544398476 Fix format in README 2015-05-28 11:46:25 -05:00
Nick Parker 6e87d2db26 Add contributions section to README 2015-05-28 11:46:13 -05:00
Nick Parker def3373d6f Fix format in README 2015-05-28 11:42:42 -05:00
Nick Parker 4eeb4a0dc1 Add contributions section to README 2015-05-28 11:41:52 -05:00
Nick Parker 18f95ebbea Check for valid context before using cipher_store_pass
Identified by Nicholas Starke
2015-04-21 14:08:41 -05:00
Nick Parker 32117b0dea Merge pull request #119 from jberkel/prerelease
Fix amalgamation output paths
2015-04-21 11:56:04 -05:00
Jan Berkel e26aa0db09 Fix amalgamation output paths
sqlite3.c gets generated as a result of this script
2015-04-21 15:16:19 +01:00
Nick Parker c14afcf742 Prevent segfault when invalid cipher name provided, identified by Nicholas Starke 2015-04-16 08:57:29 -05:00
Nick Parker 388970a669 Fix spelling 2015-03-25 14:53:22 -05:00
Nick Parker fafb0d05bd Update change log 2015-03-25 14:47:02 -05:00
Nick Parker 4677f474b1 Bump cipher_version value in test 2015-03-20 10:49:35 -05:00
Nick Parker 88be2c676d Bump cipher version to 3.3.0 2015-03-20 10:22:46 -05:00
Nick Parker f0cf4c5b25 Rebuilt configure from autoconf 2015-03-20 10:04:53 -05:00
Nick Parker e44ce2ccd5 Only call FIPS_mode when compiled with SQLCIPHER_FIPS 2015-03-20 10:04:34 -05:00
Nick Parker eb94bb8747 set writeOnly to false when performing sqlite3BtreeRollback 2015-03-20 10:03:51 -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 5fd8abafb0 Adjust FIPS initialization and status query 2015-03-17 16:05:54 -05:00
Nick Parker 29b00cb2fc Initial FIPS integration 2015-03-10 14:33:43 -05:00
Nick Parker ea0d002545 Merge branch 'likema-feature/aix' into prerelease 2015-03-10 13:24:31 -05:00
Nick Parker 15186850b5 Merge branch 'feature/aix' of https://github.com/likema/sqlcipher into likema-feature/aix 2015-03-10 13:23:41 -05:00
Nick Parker f56a6acb88 Initial work on changelog 2015-03-04 08:46:21 -06:00
Like Ma a94d35c7dc Fix building error by GCC 4.5.4 in AIX 5.1
GCC reported undefined mmap without _AIX macro.
2015-03-03 15:07:16 +08:00
Stephen Lombardo acb86dcc7e adjust readme to explain why SQLITE_TEMP_STORE is omitted from example 2015-01-30 17:00:13 -05:00
Nick Parker a31d65d7c8 Add support for attaching databases with non-default page sizes 2015-01-29 10:39:12 -06:00
Nick Parker 7180cded4d Remove static modifier from codec password storage functions 2014-12-16 16:19:35 -06:00
Nick Parker 54da745d45 Merge branch 'master' into prerelease 2014-12-03 10:30:07 -06:00
Billy Gray e1663ef003 Updates sqlcipher.xcodeproj ARCH settings for iOS builds to $(ARCHS_STANDARD) + armv7s 2014-12-03 11:18:10 -05:00
Nick Parker adcd37c89a Adjust amalgamation to target OS X only 2014-12-03 09:50:51 -06:00
Nick Parker 7990bf4e14 Merge branch 'MKleusberg-fix-readme-link' into prerelease 2014-11-03 15:14:14 -06:00
Martin Kleusberg b8455e0b01 Fix dead link in README file
Fix the link point to the issues page in the README.md file.
2014-11-01 13:24:11 +01:00
Nick Parker e7b8d1f1d6 Merge branch 'prerelease' 2014-09-30 15:05:21 -05:00
Nick Parker c0b9920fa3 Change cipher_version test to match current version 2014-09-30 13:43:13 -05:00
Nick Parker dcb021c509 Bump cipher_version to 3.2.0 2014-09-30 11:53:49 -05:00
Nick Parker 57e8792654 Remove extra block from merge 2014-09-30 11:53:17 -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