openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

resolve merge conflicts of d6f5af3 to nyc-mr1-dev-plus-aosp 

Change-Id: Ie579411df1d4f04a7f5f29457fbcf7b47c9d09ec
This commit is contained in:
Sami Tolvanen 2016-06-06 23:07:54 -07:00
parent b8f947f727 d6f5af35d5
commit b04dbbcd1e
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs_mgr/fs_mgr_verity.cpp
View File

@ -145,6 +145,18 @@ out:
return retval;
}
static int verify_verity_signature(const struct fec_verity_metadata& verity)
{
if (verify_table(verity.signature, sizeof(verity.signature),
verity.table, verity.table_length) == 0 ||
verify_table(verity.ecc_signature, sizeof(verity.ecc_signature),
verity.table, verity.table_length) == 0) {
return 0;
}
return -1;
}
static int invalidate_table(char *table, size_t table_length)
{
size_t n = 0;
@ -950,8 +962,7 @@ int fs_mgr_setup_verity(struct fstab_rec *fstab)
}
// verify the signature on the table
if (verify_table(verity.signature, sizeof(verity.signature), params.table,
verity.table_length) < 0) {
if (verify_verity_signature(verity) < 0) {
if (params.mode == VERITY_MODE_LOGGING) {
// the user has been warned, allow mounting without dm-verity
retval = FS_MGR_SETUP_VERITY_SUCCESS;