AU: detect failure when using public key verification

download_action.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "update_engine/download_action.h"
 #include <errno.h>
 #include <algorithm>
 #include <string>
 #include <vector>
 #include <glib.h>
@@ skipping 143 matching lines @@
     LOG_IF(WARNING, writer_->Close() != 0) << "Error closing the writer.";
     writer_ = NULL;
   }
   if (delegate_) {
     delegate_->SetDownloadStatus(false);  // Set to inactive.
   }
   ActionExitCode code =
       successful ? kActionCodeSuccess : kActionCodeDownloadTransferError;
   if (code == kActionCodeSuccess) {
     if (!install_plan_.is_full_update) {
+      bool public_key_verify_failed = false;
       if (!delta_performer_->VerifyPayload("",
                                            install_plan_.download_hash,
-                                           install_plan_.size)) {
+                                           install_plan_.size,
+                                           &public_key_verify_failed)) {
         LOG(ERROR) << "Download of " << install_plan_.download_url
                    << " failed due to payload verification error.";
         code = kActionCodeDownloadPayloadVerificationError;
       } else if (!delta_performer_->GetNewPartitionInfo(
           &install_plan_.kernel_size,
           &install_plan_.kernel_hash,
           &install_plan_.rootfs_size,
           &install_plan_.rootfs_hash)) {
         LOG(ERROR) << "Unable to get new partition hash info.";
         code = kActionCodeDownloadNewPartitionInfoError;
       }
+      if (!public_key_verify_failed) {
+        // TODO(adlr): squash the http verify failure warning

[petkov, 2011/03/30 21:04:42]

what do you mean?

[adlr, 2011/03/30 21:52:19]

Removed this code and made a cleaner comment

+      }
     } else {
       // Makes sure the hash and size are correct for an old-style full update.
       omaha_hash_calculator_.Finalize();
       if (omaha_hash_calculator_.hash() != install_plan_.download_hash) {
         LOG(ERROR) << "Download of " << install_plan_.download_url
                    << " failed. Expected hash " << install_plan_.download_hash
                    << " but got hash " << omaha_hash_calculator_.hash();
         code = kActionCodeDownloadHashMismatchError;
       } else if (bytes_received_ != install_plan_.size) {
         LOG(ERROR) << "Download of " << install_plan_.download_url
@@ skipping 12 matching lines @@
   processor_->ActionComplete(this, code);
 }
 
 void DownloadAction::TransferTerminated(HttpFetcher *fetcher) {
   if (code_ != kActionCodeSuccess) {
     processor_->ActionComplete(this, code_);
   }
 }
 
 };  // namespace {}