Skip to content

Re-read pages through the codec when rekeying instead of trusting the cache #636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LucaCappelletti94 wants to merge 1 commit into
base: beta
Choose a base branch
from
Open

Re-read pages through the codec when rekeying instead of trusting the cache #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/sqlcipher.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4622,6 +4622,9 @@ int sqlite3_rekey_v2(sqlite3 *db, const char *zDb, const void *pKey, int nKey) {
goto cleanup;
}

/* re-read every page through the codec instead of trusting the cache */
sqlite3BtreeClearCache(pDb->pBt);

/* determine what mode to operate in */
if(!ctx) {
/* no attached sqlcipher context means plaintext database conversion to encrypted */
Expand Down
58 changes: 58 additions & 0 deletions test/sqlcipher-rekey.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,4 +1001,62 @@ do_test rekey-encrypted-without-keying {
db close
file delete -force test.db

proc rekey_flip_byte {file off} {
set fd [open $file r+]
fconfigure $fd -translation binary
seek $fd $off
binary scan [read $fd 1] c v
seek $fd $off
puts -nonewline $fd [binary format c [expr {$v ^ 1}]]
close $fd
}

# a page tampered on disk while cached must make the rekey fail
do_test rekey-detects-page-tampered-while-cached {
sqlite_orig db test.db

execsql {
PRAGMA key = 'test123';
CREATE TABLE t1(a,b);
BEGIN;
}
for {set i 1} {$i<=2000} {incr i} {
execsql "INSERT INTO t1 VALUES($i, 'row value number $i with padding to spread rows across pages');"
}
execsql { COMMIT; }

execsql { SELECT count(*), sum(length(b)) FROM t1; }

set pgsz [lindex [execsql {PRAGMA page_size;}] 0]
set pgcount [lindex [execsql {PRAGMA page_count;}] 0]
set off [expr {($pgcount-1)*$pgsz + 100}]

rekey_flip_byte test.db $off

set rc {}
lappend rc [catchsql { PRAGMA rekey = 'test321'; }]
db close

sqlite_orig db test.db
lappend rc [catchsql { PRAGMA key = 'test321'; SELECT count(*) FROM t1; }]
db close

sqlite_orig db test.db
lappend rc [catchsql { PRAGMA key = 'test123'; SELECT name FROM sqlite_schema; }]
db close

rekey_flip_byte test.db $off

sqlite_orig db test.db
lappend rc [catchsql {
PRAGMA key = 'test123';
SELECT count(*) FROM t1;
PRAGMA integrity_check;
PRAGMA cipher_integrity_check;
}]
set rc
} {{1 {An error occurred with PRAGMA key or rekey.}} {1 {file is not a database}} {0 {ok t1}} {0 {ok 2000 ok}}}
db close
file delete -force test.db

finish_test