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
3019c79930
Merge branch 'prerelease' of https://github.com/sqlcipher/sqlcipher into Xcode5
2013-09-12 15:57:01 -04:00
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
a28129e3f6
Merge branch 'prerelease' of https://github.com/sqlcipher/sqlcipher into Xcode5
2013-09-12 12:49:31 -04:00
9d84aca41d
Proper format for key on attach, migrate user_version
2013-09-12 09:16:21 -05:00
018c0fb979
remove unused variables
2013-09-03 17:29:13 -04:00
16167e9855
restore use of ArraySize convenience function
2013-09-03 16:54:23 -04:00
f2912623bc
fix regression itroduced in prior commit
2013-09-03 16:47:11 -04:00
f25510fb98
ANSI C and win c compiler fixes
2013-09-11 16:27:27 -04:00
4872b2af20
Fix lib naming for pkg-config
2013-09-06 07:57:22 -05:00
fd75108661
Merge sqlite-release(3.8.0.1) into prerelease-integration
2013-08-30 16:09:14 -05:00
679f2be40c
Snapshot of upstream SQLite 3.8.0.1
2013-08-30 16:04:26 -05:00
2cb820717e
Add test to key multiple databases with pragma using different keys
2013-08-30 15:48:44 -05:00
7a6ce37e61
Merge branch 'sqlite-release' into prerelease
2013-08-30 15:12:24 -04:00
7c0cc33aab
remove files that aren't included upstream
2013-08-30 15:08:24 -04:00
045844f0cc
Adjust codec tracing, add rekey by name test.
2013-08-30 09:49:46 -05:00
4bc456d6e7
Remove files that were added that shouldn't have been.
2013-08-30 08:45:01 -05:00
480250aa82
Adding test for pragma key on attach
2013-08-30 08:26:18 -05:00
1ba0e0e418
Adjust db_index search count and rename codec_pragma
2013-08-30 08:24:57 -05:00
20a92abadb
Using the _v2 version of key and rekey.
2013-08-29 14:49:37 -05:00
1f17e15851
Implement sqlite3_key_v2 & sqlite3_rekey_v2.
2013-08-29 11:57:03 -05:00
432585f0f8
Adjustments due to upstream merging
2013-08-29 09:04:14 -05:00
897f402696
Merge sqlite-release(3.8.0) into prerelease-integration
...
Conflicts:
configure
ext/misc/closure.c
ext/misc/fuzzer.c
ext/misc/ieee754.c
ext/misc/nextchar.c
ext/misc/regexp.c
ext/misc/spellfix.c
magic.txt
src/test_fs.c
test/backup4.test
test/btreefault.test
test/close.test
test/fts3expr3.test
test/fts3tok1.test
test/fts3tok_err.test
test/incrvacuum3.test
test/ioerr6.test
test/orderby1.test
test/resolver01.test
test/tkt-7a31705a7e6.test
test/transitive1.test
test/whereE.test
test/whereF.test
2013-08-29 08:22:50 -05:00
45915dda5d
Snapshot of upstream SQLite 3.8.0
2013-08-29 08:11:18 -05:00
3343aaf77e
corrects use of openssl api to commoncrypto, links Security.framework, re-links libsqlcipher.a to fix archive errors, removes use of openssl
2013-08-27 16:05:48 -04:00
f1069eeefe
Unlinks amalgamation target as dependency, run make to execute amalgamation by Makefile before building in Xcode
2013-08-27 12:05:26 -04:00
167aab2da6
Merge branch 'prerelease' into Xcode5
2013-08-27 12:04:40 -04:00
4534af9072
updates amalgamation script, but we'll probably have to drop it for Makefile
2013-08-27 11:48:48 -04:00
f4eb3b33c6
Bump cipher_version to 3.0.0
2013-08-14 08:20:32 -05:00
cfee6c249c
Merge branch 'attach' into kdfiter
...
Conflicts:
test/crypto.test
2013-08-13 15:27:51 -05:00
6f4a0f2d8d
Adjustments to cipher_migrate
...
- And format flags when checking for exit condition
- Pass key size to sqlcipher_check_connection
- Trace version upgrade logic
2013-08-13 14:53:08 -05:00
c3f6cf1e02
null termination of key value
2013-08-13 12:54:16 -04:00
dce806aae5
Add tests for cipher_migrate
2013-08-12 15:09:11 -05:00
f844a5dfc3
Attach new codec before btree copy
2013-07-29 11:04:29 -05:00
9b415f6401
Work to configure the proper env. for the migration
2013-07-26 16:50:36 -05:00
b507d1b180
Clean up compiler warnings
2013-07-26 09:29:36 -05:00
fb14d957ca
Swap btree for write, reset password on codec - working.
2013-07-26 09:20:18 -05:00
b92ddfc1ef
More work on cipher_migrate, still unusable
2013-07-25 16:22:58 -05:00
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
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
81e487afb7
Merge remote-tracking branch 'origin/prerelease' into kdfiter
2013-07-11 16:21:00 -05:00
1d3fc78431
Merge branch 'prerelease' into kdfiter
...
Conflicts:
src/crypto_impl.c
2013-07-11 14:51:09 -05:00
c61663d780
Merge branch 'prerelease'
2013-07-10 10:52:24 -04:00
3ef19cf3d5
Merge branch 'prerelease' of github.com:sqlcipher/sqlcipher into prerelease
2013-07-10 10:46:05 -04:00
337eac9fd9
bump cipher_version to 2.2.1
2013-07-10 10:45:44 -04:00
15c09c04c7
Update README
2013-07-09 11:56:31 -05:00
8866a9f6cf
allow -DSQLCIPHER_OPENSSL_NO_MUTEX_RAND to disable openssl rand mutex
2013-07-09 11:57:02 -04:00
f3389d23a2
mutex around RAND_bytes()
2013-07-09 11:30:19 -04:00
573d7b209d
improve initialization and thread safety for default crypto provider
2013-07-09 11:26:40 -04:00
5827b3d3db
Merge branch 'prerelease' into attach
2013-06-27 19:09:42 -04:00
Billy Gray
Nick Parker
Stephen Lombardo