mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-07 12:25:00 -04:00
ANDROID: Incremental fs: Pad hash blocks
Test: incfs_test passes Bug: 133435829 Signed-off-by: Paul Lawrence <paullawrence@google.com> Change-Id: I4e6fbd0938f00e7e6883ce1a26cbfd38fdcaa9a5
This commit is contained in:
parent
c9c4db5da6
commit
e761a2002f
2 changed files with 20 additions and 3 deletions
|
|
@ -750,8 +750,9 @@ static int build_mtree(struct test_file *file)
|
|||
if (block_count == 1) {
|
||||
int seed = get_file_block_seed(file->index, 0);
|
||||
|
||||
memset(data, 0, INCFS_DATA_FILE_BLOCK_SIZE);
|
||||
rnd_buf((uint8_t *)data, file->size, seed);
|
||||
sha256(data, file->size, file->root_hash);
|
||||
sha256(data, INCFS_DATA_FILE_BLOCK_SIZE, file->root_hash);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -766,11 +767,13 @@ static int build_mtree(struct test_file *file)
|
|||
int seed = get_file_block_seed(file->index, i);
|
||||
char *hash_ptr = file->mtree[block_index].data + block_off;
|
||||
|
||||
if (file->size - offset < block_size)
|
||||
if (file->size - offset < block_size) {
|
||||
block_size = file->size - offset;
|
||||
memset(data, 0, INCFS_DATA_FILE_BLOCK_SIZE);
|
||||
}
|
||||
|
||||
rnd_buf((uint8_t *)data, block_size, seed);
|
||||
sha256(data, block_size, hash_ptr);
|
||||
sha256(data, INCFS_DATA_FILE_BLOCK_SIZE, hash_ptr);
|
||||
}
|
||||
|
||||
/* Build higher levels of hash tree. */
|
||||
|
|
|
|||
Loading…
Reference in a new issue