PayloadVerifier should not depend on DeltaPerformer to load payload.
The implementation in DeltaPerformer is designed for situation that payload
might only partially available, but in PayloadVerifier we already have the
whole payload. So I implemented LoadPayload in PayloadSigner which logic is
simpler and supports both version 1 and 2.
VerifySignedPayload is also moved to PayloadSigner since it's not used in
update engine daemon.
This patch also fixed wrong metadata size out in version 2 and misspelling
of metadata in WritePayload in PayloadFile.
Bug: 23981164
TEST=unit test added.
Change-Id: Id1917fc891dbf2075978a273d1a4ee3c4ecf0571
diff --git a/payload_generator/payload_file.h b/payload_generator/payload_file.h
index b586d73..51584d6 100644
--- a/payload_generator/payload_file.h
+++ b/payload_generator/payload_file.h
@@ -52,7 +52,7 @@
bool WritePayload(const std::string& payload_file,
const std::string& data_blobs_path,
const std::string& private_key_path,
- uint64_t* medatata_size_out);
+ uint64_t* metadata_size_out);
private:
FRIEND_TEST(PayloadFileTest, ReorderBlobsTest);
@@ -98,12 +98,6 @@
std::vector<Partition> part_vec_;
};
-// Adds a dummy operation that points to a signature blob located at the
-// specified offset/length.
-void AddSignatureOp(uint64_t signature_blob_offset,
- uint64_t signature_blob_length,
- DeltaArchiveManifest* manifest);
-
} // namespace chromeos_update_engine
#endif // UPDATE_ENGINE_PAYLOAD_GENERATOR_PAYLOAD_FILE_H_