Commit Graph

455 Commits

Author SHA1 Message Date
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
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 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
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 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 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
Nick Parker bc058122a8 Static ltc prng state, add partitioned data to prng 2013-11-25 11:52:30 -06:00
Nick Parker 930b441e81 Add PRAGMA cipher_add_random to source external entropy 2013-11-25 10:34:09 -06:00
Nick Parker c7986f2905 Do not use VirtualLock/Unlock on WinRT or Windows Phone 2013-11-04 16:42:32 -06:00
Nick Parker 8338f32f04 Adjust title of cipher_migrate output 2013-10-16 10:24:56 -05:00
Stephen Lombardo a77ab89179 fix issue in configure with bare comments 2013-10-15 14:26:33 -04:00
Nick Parker bdd8d0a5c6 Change pass field to unsigned char * in cipher_ctx 2013-10-15 10:08:16 -05:00
Nick Parker 035ae3eb17 Fix compiler warnings 2013-10-15 10:08:16 -05:00
Billy Gray d2a266e104 adjusts xcodeproj, resumes use of amalgation target as dependency, no longer needs manual/makefile build 2013-10-14 11:53:15 -04:00
Billy Gray 894b8ac578 minor adjustments to .xcodeproj 2013-10-14 11:40:58 -04:00
Nick Parker 95bb90e33c Merge sqlite-release(3.8.0.2) into prerelease-integration
Conflicts:
	configure
2013-10-01 14:36:23 -05:00
Nick Parker 0b3ee4466d Snapshot of upstream SQLite 3.8.0.2 2013-10-01 14:26:57 -05:00
Nick Parker ccb36a07e2 Adjust file size of sqlcipher-3.0-testkey.db to 1 MB 2013-09-23 16:55:46 -05:00
Nick Parker dac4536bad Bumping file size of sqlcipher-2.0-beta-testkey.db to 1 MB 2013-09-23 16:51:26 -05:00
Nick Parker 85520469e2 Adjust sqlcipher-2.0-be-testkey.db to 1 MB in size 2013-09-23 16:46:34 -05:00
Nick Parker 0add35073b Adjust file size of sqlcipher-2.0-le-testkey.db to over 1 MB 2013-09-23 16:41:34 -05:00
Nick Parker 9ef4eec581 Adjust sqlite3_test_control_pending_byte to test larger files
- Bump records in 1.1.8 db to increase file size to 1 MB.
2013-09-23 16:37:04 -05:00