Match server version of DM API proto.

components/policy/core/common/cloud/cloud_policy_validator.cc

 // Copyright (c) 2012 The Chromium 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 "components/policy/core/common/cloud/cloud_policy_validator.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind_helpers.h"
@@ skipping 244 matching lines @@
 
   for (size_t i = 0; i < arraysize(kCheckFunctions); ++i) {
     if (validation_flags_ & kCheckFunctions[i].flag) {
       status_ = (this->*(kCheckFunctions[i].checkFunction))();
       if (status_ != VALIDATION_OK)
         break;
     }
   }
 }
 
-// Verifies the |new_public_key_verification_signature| for the |new_public_key|
-// in the policy blob.
+// Verifies the |new_public_key_verification_signature_deprecated| for the
+// |new_public_key| in the policy blob.
 bool CloudPolicyValidatorBase::CheckNewPublicKeyVerificationSignature() {
   // If there's no local verification key, then just return true (no
   // validation possible).
   if (verification_key_.empty()) {
     UMA_HISTOGRAM_ENUMERATION(kMetricPolicyKeyVerification,
                               METRIC_POLICY_KEY_VERIFICATION_KEY_MISSING,
                               METRIC_POLICY_KEY_VERIFICATION_SIZE);
     return true;
   }
 
-  if (!policy_->has_new_public_key_verification_signature()) {
+  if (!policy_->has_new_public_key_verification_signature_deprecated()) {
     // Policy does not contain a verification signature, so log an error.
     LOG(ERROR) << "Policy is missing public_key_verification_signature";
     UMA_HISTOGRAM_ENUMERATION(kMetricPolicyKeyVerification,
                               METRIC_POLICY_KEY_VERIFICATION_SIGNATURE_MISSING,
                               METRIC_POLICY_KEY_VERIFICATION_SIZE);
     return false;
   }
 
   if (!CheckVerificationKeySignature(
           policy_->new_public_key(),
           verification_key_,
-          policy_->new_public_key_verification_signature())) {
+          policy_->new_public_key_verification_signature_deprecated())) {
     LOG(ERROR) << "Signature verification failed";
     UMA_HISTOGRAM_ENUMERATION(kMetricPolicyKeyVerification,
                               METRIC_POLICY_KEY_VERIFICATION_FAILED,
                               METRIC_POLICY_KEY_VERIFICATION_SIZE);
     return false;
   }
   // Signature verification succeeded - return success to the caller.
   DVLOG(1) << "Signature verification succeeded";
   UMA_HISTOGRAM_ENUMERATION(kMetricPolicyKeyVerification,
                             METRIC_POLICY_KEY_VERIFICATION_SUCCEEDED,
                             METRIC_POLICY_KEY_VERIFICATION_SIZE);
   return true;
 }
 
 bool CloudPolicyValidatorBase::CheckVerificationKeySignature(
     const std::string& key,
     const std::string& verification_key,
     const std::string& signature) {
   DCHECK(!verification_key.empty());
-  em::PolicyPublicKeyAndDomain signed_data;
+  em::DEPRECATEDPolicyPublicKeyAndDomain signed_data;
   signed_data.set_new_public_key(key);
 
   // If no owning_domain_ supplied, try extracting the domain from the policy
   // itself (this happens on certain platforms during startup, when we validate
   // cached policy before prefs are loaded).
   std::string domain = owning_domain_.empty() ?
       ExtractDomainFromPolicy() : owning_domain_;
   if (domain.empty()) {
     LOG(ERROR) << "Policy does not contain a domain";
     return false;
@@ skipping 240 matching lines @@
   return verifier.VerifyFinal();
 }
 
 template class CloudPolicyValidator<em::CloudPolicySettings>;
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 template class CloudPolicyValidator<em::ExternalPolicyData>;
 #endif
 
 }  // namespace policy