AU: Split applied update verification into a separate step.

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 47 matching lines @@
                               rootfs_buffered_file_writer_.get()));
       split_file_writer_->SetFirstOpenArgs(
           install_plan_.kernel_install_path.c_str(),
           O_WRONLY | O_CREAT | O_TRUNC | O_LARGEFILE,
           0644);
       decompressing_file_writer_.reset(
           new GzipDecompressingFileWriter(split_file_writer_.get()));
       writer_ = decompressing_file_writer_.get();
     } else {
       delta_performer_.reset(new DeltaPerformer(prefs_));
-      delta_performer_->set_current_kernel_hash(
-          &install_plan_.current_kernel_hash);
-      delta_performer_->set_current_rootfs_hash(
-          &install_plan_.current_rootfs_hash);
+      delta_performer_->set_current_kernel_hash(install_plan_.kernel_hash);
+      delta_performer_->set_current_rootfs_hash(install_plan_.rootfs_hash);
       writer_ = delta_performer_.get();
     }
   }
   int rc = writer_->Open(install_plan_.install_path.c_str(),
                          O_TRUNC | O_WRONLY | O_CREAT | O_LARGEFILE,
                          0644);
   if (rc < 0) {
     LOG(ERROR) << "Unable to open output file " << install_plan_.install_path;
     // report error to processor
     processor_->ActionComplete(this, kActionCodeInstallDeviceOpenError);
@@ skipping 80 matching lines @@
   ActionExitCode code =
       successful ? kActionCodeSuccess : kActionCodeDownloadTransferError;
   if (code == kActionCodeSuccess) {
     if (!install_plan_.is_full_update) {
       if (!delta_performer_->VerifyPayload("",
                                            install_plan_.download_hash,
                                            install_plan_.size)) {
         LOG(ERROR) << "Download of " << install_plan_.download_url
                    << " failed due to payload verification error.";
         code = kActionCodeDownloadPayloadVerificationError;
-      } else if (!delta_performer_->VerifyAppliedUpdate(
-          install_plan_.install_path, install_plan_.kernel_install_path)) {
-        LOG(ERROR) << "Download of " << install_plan_.download_url
-                   << " failed due to applied update verification error.";
-        code = kActionCodeDownloadAppliedUpdateVerificationError;
+      } 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;
       }
     } 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
                    << " failed. Expected size " << install_plan_.size
                    << " but got size " << bytes_received_;
         code = kActionCodeDownloadSizeMismatchError;
       }
     }
   }
 
   FlushLinuxCaches();
 
   // Write the path to the output pipe if we're successful.
   if (code == kActionCodeSuccess && HasOutputPipe())
-    SetOutputObject(GetInputObject());
+    SetOutputObject(install_plan_);
   processor_->ActionComplete(this, code);
 }
 
 void DownloadAction::TransferTerminated(HttpFetcher *fetcher) {
   if (code_ != kActionCodeSuccess) {
     processor_->ActionComplete(this, code_);
   }
 }
 
 };  // namespace {}