From dcd93a0e6668cd01259c2cefa366319101d9b450 Mon Sep 17 00:00:00 2001
From: Sorin Jianu <sorin@chromium.org>
Date: Fri, 12 Jul 2019 15:05:20 -0700
Subject: [PATCH] Move to using
 enterprise_management::PublicKeyVerificationData instead of the deprecated
 enterprise_management::DEPRECATEDPolicyPublicKeyAndDomain.

---
 omaha/goopdate/dm_client_unittest.cc |  2 +-
 omaha/goopdate/dm_messages.cc        | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/omaha/goopdate/dm_client_unittest.cc b/omaha/goopdate/dm_client_unittest.cc
index a4e39fdc8..7dd3b0a56 100644
--- a/omaha/goopdate/dm_client_unittest.cc
+++ b/omaha/goopdate/dm_client_unittest.cc
@@ -532,7 +532,7 @@ class DmClientRequestTest : public ::testing::Test {
     std::string public_key_verification_signature(
         reinterpret_cast<const char*>(public_key_signature),
         public_key_signature_length);
-    response->set_new_public_key_verification_signature_deprecated(
+    response->set_new_public_key_verification_data_signature(
         public_key_verification_signature);
 
     // Add the PolicyData signature to the policy response.
diff --git a/omaha/goopdate/dm_messages.cc b/omaha/goopdate/dm_messages.cc
index a4dc98d17..9a5a0ea3f 100644
--- a/omaha/goopdate/dm_messages.cc
+++ b/omaha/goopdate/dm_messages.cc
@@ -103,7 +103,7 @@ bool CheckVerificationKeySignature(
     const std::string& key,
     const std::string& verification_key,
     const std::string& signature) {
-  enterprise_management::DEPRECATEDPolicyPublicKeyAndDomain signed_data;
+  enterprise_management::PublicKeyVerificationData signed_data;
   signed_data.set_new_public_key(key);
 
   std::string username = policy_data.username();
@@ -115,6 +115,11 @@ bool CheckVerificationKeySignature(
   }
 
   signed_data.set_domain(domain);
+
+  if (policy_data.has_public_key_version()) {
+    signed_data.set_new_public_key_version(policy_data.public_key_version());
+  }
+
   std::string signed_data_as_string;
   if (!signed_data.SerializeToString(&signed_data_as_string)) {
     REPORT_LOG(LE, (_T("[CheckVerificationKeySignature]")
@@ -128,15 +133,15 @@ bool CheckVerificationKeySignature(
                          CALG_SHA_256);
 }
 
-// Verifies that the |new_public_key_verification_signature_deprecated| verifies
-// with the hardcoded |GetPolicyVerificationKey()| for the |new_public_key| in
+// Verifies that the |new_public_key_verification_data_signature| verifies with
+// the hardcoded |GetPolicyVerificationKey()| for the |new_public_key| in
 // |fetch_response|.
 bool CheckNewPublicKeyVerificationSignature(
     const enterprise_management::PolicyFetchResponse& fetch_response,
     const enterprise_management::PolicyData& policy_data) {
-  if (!fetch_response.has_new_public_key_verification_signature_deprecated()) {
+  if (!fetch_response.has_new_public_key_verification_data_signature()) {
     REPORT_LOG(LE, (_T("[CheckNewPublicKeyVerificationSignature]")
-        _T("[Policy missing public_key_verification_signature_deprecated]")));
+        _T("[Policy missing new_public_key_verification_data_signature]")));
     return false;
   }
 
@@ -144,7 +149,7 @@ bool CheckNewPublicKeyVerificationSignature(
            policy_data,
            fetch_response.new_public_key(),
            GetPolicyVerificationKey(),
-           fetch_response.new_public_key_verification_signature_deprecated())) {
+           fetch_response.new_public_key_verification_data_signature())) {
     REPORT_LOG(LE, (_T("[CheckNewPublicKeyVerificationSignature]")
                     _T("[Signature verification failed]")));
     return false;