Commit Graph
344 Commits
Author SHA1 Message Date
Billy Gray 50bd041c8a Merge branch 'master' into ditto 2016-04-15 15:29:51 -04:00
Nick Parker 85a407e259 Move declaration to top level of block 2016-03-07 14:35:07 -06:00
Nick Parker bc9fda6b26 Issue warning for deprecated PRAGMA cipher command 2016-03-03 11:23:11 -06:00
Nick Parker 12ae0e57dd Bump cipher_version to 3.4.0 2016-02-24 14:40:12 -06:00
Nick Parker f9044bf604 Initial reporting of the cipher provider version
Execute PRAGMA cipher_provider_version;

Supports OpenSSL, libtomcrypt, and
common crypto when running on OS X
2016-02-22 15:53:08 -06:00
Nick Parker cbcb03710a Pass flag to sqlite3PagerGet 2016-02-22 12:39:29 -06:00
Nick Parker 3550fb400a Merge sqlite-release(3.11.0) into prerelease-integration 2016-02-22 11:20:06 -06:00
Nick Parker 376eb11e20 Snapshot of upstream SQLite 3.11.0 2016-02-22 10:40:43 -06:00
Steve Thomas a5d41bf0ad Validate Hex 2016-01-27 10:59:39 -06:00
Steve Thomas f556390462 Added cipher_isHex() 2016-01-27 10:53:24 -06: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 18f95ebbea Check for valid context before using cipher_store_pass
Identified by Nicholas Starke
2015-04-21 14:08:41 -05: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 ca4962e4f4 Merge branch 'prerelease' into ditto 2015-03-20 13:01:55 -05:00
Nick Parker 88be2c676d Bump cipher version to 3.3.0 2015-03-20 10:22:46 -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 15186850b5 Merge branch 'feature/aix' of https://github.com/likema/sqlcipher into likema-feature/aix 2015-03-10 13:23:41 -05: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
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
Billy Gray 30d86a598b Merge branch 'prerelease' into ditto 2014-12-03 15:30:53 -05:00
Nick Parker dcb021c509 Bump cipher_version to 3.2.0 2014-09-30 11:53:49 -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
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 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
Billy Gray 5bc5cf4b41 Merge branch 'master' of github.com:sqlcipher/sqlcipher into ditto 2013-12-16 12:06:22 -05: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