cipher_integrity check will report expected page size if invalid

sjlombardo · sjlombardo · commit c6bf239e2b4a · 2023-11-15T10:06:09.000-05:00
diff --git a/src/crypto_impl.c b/src/crypto_impl.c
@@ -1391,7 +1391,7 @@ int sqlcipher_codec_ctx_integrity_check(codec_ctx *ctx, Parse *pParse, char *col
   }
 
   if(file_sz % ctx->page_sz != 0) {
-    result = sqlite3_mprintf("page %d has an invalid size of %lld bytes", page, file_sz - ((file_sz / ctx->page_sz) * ctx->page_sz));
+    result = sqlite3_mprintf("page %d has an invalid size of %lld bytes (expected %d bytes)", page, file_sz - ((file_sz / ctx->page_sz) * ctx->page_sz), ctx->page_sz);
     sqlite3VdbeAddOp4(v, OP_String8, 0, 1, 0, result, P4_DYNAMIC);
     sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 1);
   }
diff --git a/test/sqlcipher-integrity.test b/test/sqlcipher-integrity.test
@@ -310,7 +310,7 @@ do_test version-4-integrity-check-invalid-last-page {
     PRAGMA key = 'testkey';
     PRAGMA cipher_integrity_check;
   } 
-} {ok {page 240 has an invalid size of 2 bytes}}
+} {ok {page 240 has an invalid size of 2 bytes (expected 4096 bytes)}}
 db close
 file delete -force test.db
 

Original file line number	Diff line number	Diff line change
`@@ -1391,7 +1391,7 @@ int sqlcipher_codec_ctx_integrity_check(codec_ctx ctx, Parse pParse, char *col`
`1391`	`1391`	`}`
`1392`	`1392`
`1393`	`1393`	`if(file_sz % ctx->page_sz != 0) {`
`1394`		`- result = sqlite3_mprintf("page %d has an invalid size of %lld bytes", page, file_sz - ((file_sz / ctx->page_sz) * ctx->page_sz));`
	`1394`	`+ result = sqlite3_mprintf("page %d has an invalid size of %lld bytes (expected %d bytes)", page, file_sz - ((file_sz / ctx->page_sz) * ctx->page_sz), ctx->page_sz);`
`1395`	`1395`	`sqlite3VdbeAddOp4(v, OP_String8, 0, 1, 0, result, P4_DYNAMIC);`
`1396`	`1396`	`sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 1);`
`1397`	`1397`	`}`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ do_test version-4-integrity-check-invalid-last-page {`
`310`	`310`	`PRAGMA key = 'testkey';`
`311`	`311`	`PRAGMA cipher_integrity_check;`
`312`	`312`	`}`
`313`		`-} {ok {page 240 has an invalid size of 2 bytes}}`
	`313`	`+} {ok {page 240 has an invalid size of 2 bytes (expected 4096 bytes)}}`
`314`	`314`	`db close`
`315`	`315`	`file delete -force test.db`
`316`	`316`