771 Commits

Author SHA1 Message Date
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
Hans-Christoph Steiner
82c0087c2f SQLCipher headers are installed into ${includedir}/sqlcipher
see line #163 of Makefile.in
2014-10-16 23:38:10 -04:00
Nick Parker
e7b8d1f1d6 Merge branch 'prerelease' v3.2.0 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
Tim Helfensdörfer
b67681a05f Fixed heading 2014-08-18 10:13:07 -05:00
Tim Helfensdörfer
4ed24011b2 Converted readme to valid markdown 2014-08-18 10:13:07 -05:00
Nick Parker
4e3ffe8c11 Adjust cipher version test 2014-08-18 10:13:07 -05:00
Stephen Lombardo
c6072831d1 fix redundant key derivation with common crypto provider 2014-07-25 11:42:24 -04:00
Nick Parker
90606b3d03 Add PRAGMA cipher_store_pass
PRAGMA cipher_store_pass allows the passphrase to remain in memory
which will allow an ATTACH statement to succeed without providing
the key value during ATTACH when both databases use the same passphrase,
but have different salt values.  Previously, in order to ATTACH with
this scneario, calling ATTACH required providing the key value inline.
2014-06-13 16:18:02 -05:00
Nick Parker
909658402a Merge branch 'prerelease' 2014-04-23 17:09:06 -05:00
Nick Parker
aa2e37e360 Renaming README to README.md 2014-04-23 17:09:00 -05:00
Nick Parker
6e1e43e321 Merge branch 'prerelease' 2014-04-23 17:07:19 -05:00
Nick Parker
b208a22891 Removing SQLite README.md in favor of the SQLCipher version 2014-04-23 17:07:03 -05:00
Nick Parker
5709f78aac Adjust cipher version test v3.1.0 2014-04-23 10:28:43 -05:00
Nick Parker
f8ad155b54 Bump version to 3.1.0 2014-04-23 10:07:41 -05:00
Nick Parker
fafd98ef5d Add PRAGMA cipher_profile support 2014-04-07 11:42:32 -05:00
Nick Parker
63f8f9eccc Move invocation of sqlcipher_codec_pragma 2014-04-04 14:31:27 -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
8d0acdb908 Explicitly close db in tests following cipher_migrate v3.0.1 2013-12-06 11:34:26 -06:00
Nick Parker
8f110848f3 Adjust cipher_version test 2013-12-06 11:33:40 -06:00
Nick Parker
fb1780bceb Bump cipher version 2013-12-06 11:14:50 -06:00
Nick Parker
c5360e120e Nop for adding random to commoncrypto 2013-12-06 11:12:48 -06:00
Nick Parker
bba319a716 Fix for cipher_migrate on passphrases longer than 64 characters and raw keys 2013-12-06 11:03:50 -06:00
Nick Parker
b03221fc90 Remove unused variable 2013-12-03 13:37:56 -06:00
Nick Parker
200b3146a3 Adjustment to ltc crypto provider and cipher_add_random 2013-12-03 13:32:05 -06:00
Nick Parker
4b31a37006 Enforce prefix and suffix format for cipher_add_random 2013-11-26 09:52:55 -06:00
Nick Parker
b5ece46779 Remove ltc_ctx, adjust sqlcipher_ltc_add_random behavior 2013-11-25 17:39:26 -06:00
Nick Parker
8348d8e1ed Fix compilation for Windows 2013-11-25 14:46:26 -06:00