diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-03-05 11:56:41 -0800 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2019-03-05 16:53:31 -0800 |
| commit | 838bccb515036433be3a55bec702336f170df38a (patch) | |
| tree | eb94a5e0cbab6fa3e8f5539fed44dd081f48fc04 /payload_consumer/payload_verifier.cc | |
| parent | 2af3457b7362c163b1896f7a4b6eee69f8439296 (diff) | |
| parent | 4eee53f5949d5e4cb43894b3d190daf635e31338 (diff) | |
Merge QP1A.190228.005
Change-Id: I546552fe26b74b96c18d929cdda1a527bbcdf4dc
Diffstat (limited to 'payload_consumer/payload_verifier.cc')
| -rw-r--r-- | payload_consumer/payload_verifier.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/payload_consumer/payload_verifier.cc b/payload_consumer/payload_verifier.cc index 2f7c133a..3eb1da8b 100644 --- a/payload_consumer/payload_verifier.cc +++ b/payload_consumer/payload_verifier.cc @@ -79,13 +79,12 @@ const uint8_t kRSA2048SHA256Padding[] = { } // namespace -bool PayloadVerifier::VerifySignature(const brillo::Blob& signature_blob, +bool PayloadVerifier::VerifySignature(const string& signature_proto, const string& pem_public_key, const brillo::Blob& hash_data) { Signatures signatures; - LOG(INFO) << "signature blob size = " << signature_blob.size(); - TEST_AND_RETURN_FALSE( - signatures.ParseFromArray(signature_blob.data(), signature_blob.size())); + LOG(INFO) << "signature blob size = " << signature_proto.size(); + TEST_AND_RETURN_FALSE(signatures.ParseFromString(signature_proto)); if (!signatures.signatures_size()) { LOG(ERROR) << "No signatures stored in the blob."; @@ -95,7 +94,7 @@ bool PayloadVerifier::VerifySignature(const brillo::Blob& signature_blob, std::vector<brillo::Blob> tested_hashes; // Tries every signature in the signature blob. for (int i = 0; i < signatures.signatures_size(); i++) { - const Signatures_Signature& signature = signatures.signatures(i); + const Signatures::Signature& signature = signatures.signatures(i); brillo::Blob sig_data(signature.data().begin(), signature.data().end()); brillo::Blob sig_hash_data; if (!GetRawHashFromSignature(sig_data, pem_public_key, &sig_hash_data)) |