status-im
/
sqlcipher
mirror of https://github.com/status-im/sqlcipher.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into ditto

This commit is contained in:
Stephen Lombardo 2010-10-03 08:56:49 -04:00
parent a24078d7d6 c45622d14d
commit 0266ddf6be
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/crypto.c
View File

@ -546,6 +546,8 @@ int sqlite3_rekey(sqlite3 *db, const void *pKey, int nKey) {
ctx->read_ctx->key_sz = ctx->read_ctx->iv_sz = ctx->read_ctx->pass_sz = 0;
}
sqlite3_mutex_enter(db->mutex);
if(ctx->read_ctx->iv_sz != ctx->write_ctx->iv_sz) {
char *error;
CODEC_TRACE(("sqlite3_rekey: updating page size for iv_sz change from %d to %d\n", ctx->read_ctx->iv_sz, ctx->write_ctx->iv_sz));
@ -591,6 +593,7 @@ int sqlite3_rekey(sqlite3 *db, const void *pKey, int nKey) {
}
ctx->mode_rekey = 0;
sqlite3_mutex_leave(db->mutex);
}
return SQLITE_OK;
}