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

Commit 789b5093 authored by Akilesh Kailash's avatar Akilesh Kailash
Browse files

create_snapshot: Reorder digest calculation 



Bug: 371304627
Test: create_snapshot between two builds on the host
Change-Id: I1c8908e5842b4725a10db66e83af1fbdad3652d1
Signed-off-by: default avatarAkilesh Kailash <akailash@google.com>
parent 9ea5cbf7

fs_mgr/libsnapshot/libsnapshot_cow/create_cow.cpp

+4 −3
Original line number Diff line number Diff line
@@ -478,11 +478,12 @@ bool CreateSnapshot::ReadBlocks(off_t offset, const int skip_blocks, const uint6 


            if (create_snapshot_patch_ && use_merkel_tree_) {

                std::vector<uint8_t> digest(32, 0);

                CalculateDigest(bufptr, BLOCK_SZ, target_salt_.data(), target_salt_.size(),

                CalculateDigest(bufptr, BLOCK_SZ, source_salt_.data(), source_salt_.size(),

                                digest.data());

                std::vector<uint8_t> final_digest(32, 0);

                CalculateDigest(digest.data(), digest.size(), source_salt_.data(),

                                source_salt_.size(), final_digest.data());

                CalculateDigest(digest.data(), digest.size(), target_salt_.data(),

                                target_salt_.size(), final_digest.data());



                hash = ToHexString(final_digest.data(), final_digest.size());

            } else {

                uint8_t checksum[32];