From 4c01af812958e16a09172a759d3e4408ea238bc1 Mon Sep 17 00:00:00 2001 From: Vineeta Srivastava Date: Fri, 12 May 2017 10:18:14 -0700 Subject: [PATCH] Revert "fs_mgr: Update for new libavb API." This reverts commit 7ea2c2814d10efba9fc7bc54b49293e2dfdf55fc. --- fs_mgr/fs_mgr_avb.cpp | 7 ++----- fs_mgr/fs_mgr_avb_ops.cpp | 8 +++----- fs_mgr/fs_mgr_priv_avb_ops.h | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/fs_mgr/fs_mgr_avb.cpp b/fs_mgr/fs_mgr_avb.cpp index 2b3220127..c21139e5d 100644 --- a/fs_mgr/fs_mgr_avb.cpp +++ b/fs_mgr/fs_mgr_avb.cpp @@ -486,11 +486,8 @@ FsManagerAvbUniquePtr FsManagerAvbHandle::DoOpen(FsManagerAvbOps* avb_ops) { return nullptr; } - AvbSlotVerifyFlags flags = avb_verifier->IsDeviceUnlocked() - ? AVB_SLOT_VERIFY_FLAGS_ALLOW_VERIFICATION_ERROR - : AVB_SLOT_VERIFY_FLAGS_NONE; - AvbSlotVerifyResult verify_result = - avb_ops->AvbSlotVerify(fs_mgr_get_slot_suffix(), flags, &avb_handle->avb_slot_data_); + AvbSlotVerifyResult verify_result = avb_ops->AvbSlotVerify( + fs_mgr_get_slot_suffix(), avb_verifier->IsDeviceUnlocked(), &avb_handle->avb_slot_data_); // Only allow two verify results: // - AVB_SLOT_VERIFY_RESULT_OK. diff --git a/fs_mgr/fs_mgr_avb_ops.cpp b/fs_mgr/fs_mgr_avb_ops.cpp index 512839b48..8feeb533d 100644 --- a/fs_mgr/fs_mgr_avb_ops.cpp +++ b/fs_mgr/fs_mgr_avb_ops.cpp @@ -177,15 +177,13 @@ AvbIOResult FsManagerAvbOps::ReadFromPartition(const char* partition, int64_t of } AvbSlotVerifyResult FsManagerAvbOps::AvbSlotVerify(const std::string& ab_suffix, - AvbSlotVerifyFlags flags, + bool allow_verification_error, AvbSlotVerifyData** out_data) { // Invokes avb_slot_verify() to load and verify all vbmeta images. // Sets requested_partitions to nullptr as it's to copy the contents // of HASH partitions into handle>avb_slot_data_, which is not required as // fs_mgr only deals with HASHTREE partitions. const char* requested_partitions[] = {nullptr}; - // The |hashtree_error_mode| field doesn't matter as it only - // influences the generated kernel cmdline parameters. - return avb_slot_verify(&avb_ops_, requested_partitions, ab_suffix.c_str(), flags, - AVB_HASHTREE_ERROR_MODE_RESTART_AND_INVALIDATE, out_data); + return avb_slot_verify(&avb_ops_, requested_partitions, ab_suffix.c_str(), + allow_verification_error, out_data); } diff --git a/fs_mgr/fs_mgr_priv_avb_ops.h b/fs_mgr/fs_mgr_priv_avb_ops.h index d1ef2e91d..a6b52e43f 100644 --- a/fs_mgr/fs_mgr_priv_avb_ops.h +++ b/fs_mgr/fs_mgr_priv_avb_ops.h @@ -56,7 +56,7 @@ class FsManagerAvbOps { AvbIOResult ReadFromPartition(const char* partition, int64_t offset, size_t num_bytes, void* buffer, size_t* out_num_read); - AvbSlotVerifyResult AvbSlotVerify(const std::string& ab_suffix, AvbSlotVerifyFlags flags, + AvbSlotVerifyResult AvbSlotVerify(const std::string& ab_suffix, bool allow_verification_error, AvbSlotVerifyData** out_data); private: