Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c768e307 authored by Thierry Strudel's avatar Thierry Strudel Committed by Android (Google) Code Review
Browse files

Merge "Revert "fs_mgr: Update for new libavb API.""

parents 583c5c1b 4c01af81

fs_mgr/fs_mgr_avb.cpp

+2 −5
Original line number Diff line number Diff line
@@ -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.

fs_mgr/fs_mgr_avb_ops.cpp

+3 −5
Original line number Diff line number Diff line
@@ -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);

}

fs_mgr/fs_mgr_priv_avb_ops.h

+1 −1
Original line number Diff line number Diff line
@@ -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: