Nick Parker
b92ddfc1ef
More work on cipher_migrate, still unusable
2013-07-25 16:22:58 -05:00
Nick Parker
4bc6ba08f8
Initial work on a PRAGMA cipher_migrate
...
Swapping of the Btree meta data is not working properly now.
2013-07-24 17:07:42 -05:00
Stephen Lombardo
6cd1fdf60b
finalize new attach behavior
...
- key can be specified in hex as key plus salt together
- source passphrase is cleared after derivation
- key specification containing derived key and salt stored on
cipher_ctx for use in attach on an encrypted main database
when no key is provided with the attach statement
2013-07-19 12:50:14 -04:00
Nick Parker
81e487afb7
Merge remote-tracking branch 'origin/prerelease' into kdfiter
2013-07-11 16:21:00 -05:00
Nick Parker
1d3fc78431
Merge branch 'prerelease' into kdfiter
...
Conflicts:
src/crypto_impl.c
2013-07-11 14:51:09 -05:00
Stephen Lombardo
c61663d780
Merge branch 'prerelease'
2013-07-10 10:52:24 -04:00
Stephen Lombardo
3ef19cf3d5
Merge branch 'prerelease' of github.com:sqlcipher/sqlcipher into prerelease
2013-07-10 10:46:05 -04:00
Stephen Lombardo
337eac9fd9
bump cipher_version to 2.2.1
2013-07-10 10:45:44 -04:00
Nick Parker
15c09c04c7
Update README
2013-07-09 11:56:31 -05:00
Stephen Lombardo
8866a9f6cf
allow -DSQLCIPHER_OPENSSL_NO_MUTEX_RAND to disable openssl rand mutex
2013-07-09 11:57:02 -04:00
Stephen Lombardo
f3389d23a2
mutex around RAND_bytes()
2013-07-09 11:30:19 -04:00
Stephen Lombardo
573d7b209d
improve initialization and thread safety for default crypto provider
2013-07-09 11:26:40 -04:00
Stephen Lombardo
5827b3d3db
Merge branch 'prerelease' into attach
2013-06-27 19:09:42 -04:00
Stephen Lombardo
a2bb641e48
64k iterations plus pragma cipher_default_kdf_iter function
2013-06-27 19:07:58 -04:00
Nick Parker
a1fb0d2316
Merge branch 'prerelease'
2013-06-27 10:13:06 -05:00
Stephen Lombardo
581876802e
fix build warnings under VS
2013-06-27 11:01:59 -04:00
Nick Parker
b13e77f669
Merge branch 'prerelease'
2013-06-27 09:24:30 -05:00
Stephen Lombardo
2c22d1e431
set reported SQLite version back to 3.7.17
2013-06-25 11:03:17 -04:00
Stephen Lombardo
65df5ed290
reflect SQLCipher name on startup
2013-06-22 14:43:38 -04:00
Stephen Lombardo
a31d205766
Merge branch 'prerelease' of github.com:sqlcipher/sqlcipher into prerelease
2013-06-21 13:38:36 -04:00
Stephen Lombardo
b75c9ffa4b
remove unused array allocation
2013-06-21 13:38:08 -04:00
Nick Parker
836b4b5108
Adding 'none' option to --with-crypto-lib
...
This allows for skipping of the library check, useful when only
preparing the amalgamation.
2013-06-21 12:19:56 -05:00
Stephen Lombardo
0a767d7c15
Merge branch 'prerelease' of github.com:sqlcipher/sqlcipher into prerelease
2013-06-21 11:11:36 -04:00
Stephen Lombardo
c9ec48ded8
add function to return current registered provider
2013-06-21 11:11:02 -04:00
Nick Parker
970d88bdb8
Remove SQLCIPHER_CRYPTO_OPENSSL flag for commoncrypto
2013-06-21 10:05:52 -05:00
Stephen Lombardo
51079a8775
resolve build warnings under clang
2013-06-21 11:01:18 -04:00
Stephen Lombardo
9b1a92181a
Merge branch 'prerelease' of github.com:sqlcipher/sqlcipher into prerelease
2013-06-12 15:21:07 -04:00
Stephen Lombardo
6ae95d380e
narrow root directory excludes in gitignreo
2013-06-12 15:18:48 -04:00
Nick Parker
be057d3e5f
Adjusting the configure template for commoncrypto
2013-06-12 13:45:11 -05:00
Nick Parker
1742ee4e5c
Check defined for crypto impl flag & formatting
2013-06-12 12:15:13 -05:00
Nick Parker
e8a54ad0ef
Updated configure script from autoconf
2013-06-12 10:21:44 -05:00
Nick Parker
92cec1ccdd
Default crypto provider to OpenSSL
...
When no crypto provider has been specified, set the
SQLCIPHER_CRYPTO_OPENSSL flag.
2013-06-12 10:06:59 -05:00
Stephen Lombardo
a828432a72
normalize license statements, ifdefs, and wrapper comments
2013-06-12 11:01:38 -04:00
Nick Parker
8b243d5986
Reorder check for crypto implementation flag.
2013-06-11 12:20:01 -05:00
Stephen Lombardo
91dcae725d
if no default provider defined, error with a message
2013-06-11 13:12:02 -04:00
Stephen Lombardo
979f690669
check return code on RAND_bytes();
2013-06-11 13:11:41 -04:00
Stephen Lombardo
1862c0df6f
remove internal calls to add random
2013-06-11 12:55:50 -04:00
Stephen Lombardo
b66b1420c3
adjust return values for commoncrypto
2013-06-11 12:53:48 -04:00
Nick Parker
96055def76
Merge branch 'prerelease' into multi-lib
2013-06-11 11:36:10 -05:00
Nick Parker
878f82a09c
Fix Vdbe assignment to sqlite3GetVdbe
2013-06-11 11:35:03 -05:00
Nick Parker
51f2855d36
Checking for SQLITE_OK as return code for random
2013-06-11 11:24:29 -05:00
Nick Parker
689b22ead7
Removing RAND_bytes call
2013-06-11 11:23:40 -05:00
Nick Parker
e0cd3f29be
Adjust buffer size feed into fortuna entropy
...
Also calling fortuna_ready before fortuna_read to allow for new entries
in the fotuna pool to become available. Minor format adjustments.
2013-06-11 09:23:08 -05:00
Nick Parker
6937773d64
Passing pointer to provider context
2013-06-11 09:21:16 -05:00
Stephen Lombardo
3659159b72
remove internal mutexing and move fortuna initialization to activate
2013-06-06 15:48:11 -04:00
Nick Parker
5b639be3c4
Add test for commoncrypto default cipher
2013-06-06 13:49:03 -05:00
Nick Parker
ee14e0fd2a
commoncrypto provider name
2013-06-06 12:21:46 -05:00
Nick Parker
fe9cb18154
commoncrypto integration with configure & register
2013-06-06 12:19:49 -05:00
Nick Parker
fcc1332c54
Adding to OpenSSL entropy pool when performing kdf
2013-06-06 11:18:45 -05:00
Nick Parker
7026edb969
Change call site of sqlite3_randomness and fortuna_ready
...
sqlite3_randomness was blocking when invoked with
sqlcipher_ltc_activate. As new entropy is added to the pool, calls to
fortuna_ready are required to allow the new entropy to be used.
2013-06-06 11:04:03 -05:00
