Commit Graph

428 Commits

Author SHA1 Message Date
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
Nick Parker fc2fcff453 Ignore hmac read during Btree file copy 2013-09-23 11:16:12 -05:00
Billy Gray 314f5735d9 Merge branch 'Xcode5' of github.com:sqlcipher/sqlcipher into prerelease 2013-09-13 15:49:08 -04:00
Billy Gray 0e21396eb1 Merge branch 'prerelease' of github.com:sqlcipher/sqlcipher into prerelease 2013-09-13 15:49:01 -04:00
Billy Gray cf42f10c5d sets iOS 4.3 as base deployment target, overrides to 6.0 as required for arm64 arch 2013-09-13 12:35:32 -04:00
Billy Gray 94abbd2595 specifies all valid archs for xcode-build compatibility with other platforms 2013-09-12 17:51:47 -04:00
Billy Gray 58c95b38b2 adds archs settings branch for Any iOS Simulator SDK which defaults to i386 instead of standard archs+64, overrident to standard+64 2013-09-12 16:04:47 -04:00
Billy Gray 3019c79930 Merge branch 'prerelease' of https://github.com/sqlcipher/sqlcipher into Xcode5 2013-09-12 15:57:01 -04:00
Billy Gray 4093d93e68 adjusts sqlcipher.xcodeproj, attempting to switch to new standard archs including 64bit, but simulator still building i386 2013-09-12 15:56:03 -04:00
Billy Gray a28129e3f6 Merge branch 'prerelease' of https://github.com/sqlcipher/sqlcipher into Xcode5 2013-09-12 12:49:31 -04:00
Nick Parker 9d84aca41d Proper format for key on attach, migrate user_version 2013-09-12 09:16:21 -05:00
Stephen Lombardo 018c0fb979 remove unused variables 2013-09-03 17:29:13 -04:00
Stephen Lombardo 16167e9855 restore use of ArraySize convenience function 2013-09-03 16:54:23 -04:00
Stephen Lombardo f2912623bc fix regression itroduced in prior commit 2013-09-03 16:47:11 -04:00
Stephen Lombardo f25510fb98 ANSI C and win c compiler fixes 2013-09-11 16:27:27 -04:00
Nick Parker 4872b2af20 Fix lib naming for pkg-config 2013-09-06 07:57:22 -05:00
Nick Parker fd75108661 Merge sqlite-release(3.8.0.1) into prerelease-integration 2013-08-30 16:09:14 -05:00
Nick Parker 679f2be40c Snapshot of upstream SQLite 3.8.0.1 2013-08-30 16:04:26 -05:00
Nick Parker 2cb820717e Add test to key multiple databases with pragma using different keys 2013-08-30 15:48:44 -05:00
Stephen Lombardo 7a6ce37e61 Merge branch 'sqlite-release' into prerelease 2013-08-30 15:12:24 -04:00
Stephen Lombardo 7c0cc33aab remove files that aren't included upstream 2013-08-30 15:08:24 -04:00
Nick Parker 045844f0cc Adjust codec tracing, add rekey by name test. 2013-08-30 09:49:46 -05:00
Nick Parker 4bc456d6e7 Remove files that were added that shouldn't have been. 2013-08-30 08:45:01 -05:00
Nick Parker 480250aa82 Adding test for pragma key on attach 2013-08-30 08:26:18 -05:00
Nick Parker 1ba0e0e418 Adjust db_index search count and rename codec_pragma 2013-08-30 08:24:57 -05:00
Nick Parker 20a92abadb Using the _v2 version of key and rekey. 2013-08-29 14:49:37 -05:00
Nick Parker 1f17e15851 Implement sqlite3_key_v2 & sqlite3_rekey_v2. 2013-08-29 11:57:03 -05:00
Nick Parker 432585f0f8 Adjustments due to upstream merging 2013-08-29 09:04:14 -05:00