delta_generator: Convert ABORT into an exit(1).
When verifying a signature in delta_generator, a workflow rarely used,
the program will abort if the signature is not valid. The unittests
exercise this flow by executing "delta_generator" with invalid keys
which causes it to abort during normal test runs. This creates lots of
unnecessary crash reports.
This patch replaces the CHECK() call with an exit(1) (returing 1 from
main() actually) to prevent sending SIGABRT and collecting crash
reports during the test run. Other minor linter fixes included.
Bug: None
Test: Manually ran the unittests.
Change-Id: I451a3150d72018652b703db7d3b82f4e787c8f43
diff --git a/payload_generator/generate_delta_main.cc b/payload_generator/generate_delta_main.cc
index 9b3bdfd..6c04fca 100644
--- a/payload_generator/generate_delta_main.cc
+++ b/payload_generator/generate_delta_main.cc
@@ -167,15 +167,19 @@
}
}
-void VerifySignedPayload(const string& in_file,
- const string& public_key) {
+int VerifySignedPayload(const string& in_file, const string& public_key) {
LOG(INFO) << "Verifying signed payload.";
LOG_IF(FATAL, in_file.empty())
<< "Must pass --in_file to verify signed payload.";
LOG_IF(FATAL, public_key.empty())
<< "Must pass --public_key to verify signed payload.";
- CHECK(PayloadSigner::VerifySignedPayload(in_file, public_key));
+ if (!PayloadSigner::VerifySignedPayload(in_file, public_key)) {
+ LOG(INFO) << "VerifySignedPayload failed";
+ return 1;
+ }
+
LOG(INFO) << "Done verifying signed payload.";
+ return 0;
}
// TODO(deymo): This function is likely broken for deltas minor version 2 or
@@ -222,7 +226,6 @@
LOG(INFO) << "Install partition:"
<< " source: " << part.source_path
<< " target: " << part.target_path;
-
}
DeltaPerformer performer(&prefs,
@@ -413,8 +416,7 @@
if (!FLAGS_public_key.empty()) {
LOG_IF(WARNING, FLAGS_public_key_version != -1)
<< "--public_key_version is deprecated and ignored.";
- VerifySignedPayload(FLAGS_in_file, FLAGS_public_key);
- return 0;
+ return VerifySignedPayload(FLAGS_in_file, FLAGS_public_key);
}
if (!FLAGS_properties_file.empty()) {
return ExtractProperties(FLAGS_in_file, FLAGS_properties_file) ? 0 : 1;