commit 5d95615688e7c99644b3679129d91f0c38e2eb95
author Zentaro Kavanagh <zentaro@chromium.org> Tue May 15 09:40:33 2018 -0700
committer chrome-bot <chrome-bot@chromium.org> Wed May 16 12:41:24 2018 -0700
tree a3cf0c123d014b3b733f714c70d5faebc27e1ec0
parent c288206aac04194cbeca0338c032283a0869e810

update_engine: Fix TPM variable name max_kernel_rollfoward

- In a previous CL I named the variable incorrectly

BUG=chromium:814090
TEST=FEATURES=test emerge-samus update_engine

Change-Id: I17cbc85d42ba03040bfdae436cedd0238698b47e
Reviewed-on: https://chromium-review.googlesource.com/1059944
Commit-Ready: Zentaro Kavanagh <zentaro@chromium.org>
Tested-by: Zentaro Kavanagh <zentaro@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>

common/fake_hardware.h

diff --git a/common/fake_hardware.h b/common/fake_hardware.h
index 68fdd5b..d699fb7 100644
--- a/common/fake_hardware.h
+++ b/common/fake_hardware.h
@@ -40,7 +40,7 @@
   // Default value for crossystem tpm_fwver.
   static const int kMinFirmwareKeyVersion = 13;
 
-  // Default value for crossystem max_kernel_rollforward. This value is the
+  // Default value for crossystem kernel_max_rollforward. This value is the
   // default for consumer devices and effectively means "unlimited rollforward
   // is allowed", which is the same as the behavior prior to implementing
   // roll forward prevention.
@@ -79,8 +79,8 @@
     return min_firmware_key_version_;
   }
 
-  bool SetMaxKernelKeyRollforward(int max_kernel_rollforward) override {
-    max_kernel_rollforward_ = max_kernel_rollforward;
+  bool SetMaxKernelKeyRollforward(int kernel_max_rollforward) override {
+    kernel_max_rollforward_ = kernel_max_rollforward;
     return true;
   }
 
@@ -167,7 +167,7 @@
   }
 
   // Getters to verify state.
-  int GetMaxKernelKeyRollforward() const { return max_kernel_rollforward_; }
+  int GetMaxKernelKeyRollforward() const { return kernel_max_rollforward_; }
 
  private:
   bool is_official_build_{true};
@@ -182,7 +182,7 @@
   std::string ec_version_{"Fake EC v1.0a"};
   int min_kernel_key_version_{kMinKernelKeyVersion};
   int min_firmware_key_version_{kMinFirmwareKeyVersion};
-  int max_kernel_rollforward_{kMaxKernelRollforward};
+  int kernel_max_rollforward_{kMaxKernelRollforward};
   int powerwash_count_{kPowerwashCountNotSet};
   bool powerwash_scheduled_{false};
   bool first_active_omaha_ping_sent_{false};

common/hardware_interface.h

diff --git a/common/hardware_interface.h b/common/hardware_interface.h
index 4946b91..4d7c162 100644
--- a/common/hardware_interface.h
+++ b/common/hardware_interface.h
@@ -79,9 +79,9 @@
   virtual int GetMinFirmwareKeyVersion() const = 0;
 
   // Sets the maximum kernel key version that verified boot should roll
-  // forward to. This is the value of crossystem max_kernel_rollforward.
+  // forward to. This is the value of crossystem kernel_max_rollforward.
   // Returns false if the value cannot be set, or if not running on Chrome OS.
-  virtual bool SetMaxKernelKeyRollforward(int max_kernel_rollforward) = 0;
+  virtual bool SetMaxKernelKeyRollforward(int kernel_max_rollforward) = 0;
 
   // Returns the powerwash_count from the stateful. If the file is not found
   // or is invalid, returns -1. Brand new machines out of the factory or after

common/mock_hardware.h

diff --git a/common/mock_hardware.h b/common/mock_hardware.h
index fcbb0d5..662ccd9 100644
--- a/common/mock_hardware.h
+++ b/common/mock_hardware.h
@@ -93,7 +93,7 @@
   MOCK_CONST_METHOD0(GetMinKernelKeyVersion, int());
   MOCK_CONST_METHOD0(GetMinFirmwareKeyVersion, int());
   MOCK_CONST_METHOD1(SetMaxKernelKeyRollforward,
-                     bool(int max_kernel_rollforward));
+                     bool(int kernel_max_rollforward));
   MOCK_CONST_METHOD0(GetPowerwashCount, int());
   MOCK_CONST_METHOD1(GetNonVolatileDirectory, bool(base::FilePath*));
   MOCK_CONST_METHOD1(GetPowerwashSafeDirectory, bool(base::FilePath*));