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

Commit 54a2495d authored by Greg Kaiser's avatar Greg Kaiser Committed by android-build-merger
Browse files

Merge "libfs_avb: Pass const string by reference" am: 949a561c 

am: 0e1a7826

Change-Id: Ia1702371aa34c4ff36f27d41d4a0f02e121743a0
parents 4dcddd21 0e1a7826

fs_mgr/libfs_avb/avb_util.cpp

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ bool ValidatePublicKeyBlob(const uint8_t* key, size_t length, 
    return false;

}



bool ValidatePublicKeyBlob(const std::string key_blob_to_validate,

bool ValidatePublicKeyBlob(const std::string& key_blob_to_validate,

                           const std::vector<std::string>& allowed_key_paths) {

    std::string allowed_key_blob;

    if (key_blob_to_validate.empty()) {

fs_mgr/libfs_avb/avb_util.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ VBMetaVerifyResult VerifyVBMetaSignature(const VBMetaData& vbmeta, 


bool ValidatePublicKeyBlob(const uint8_t* key, size_t length, const std::string& expected_key_blob);



bool ValidatePublicKeyBlob(const std::string key_blob_to_validate,

bool ValidatePublicKeyBlob(const std::string& key_blob_to_validate,

                           const std::vector<std::string>& expected_key_paths);



// Detects if whether a partition contains a rollback image.