Update policy signature verification to include policy domain.

components/policy/core/common/cloud/policy_builder.h

 // 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.
 
 #ifndef COMPONENTS_POLICY_CORE_COMMON_CLOUD_POLICY_BUILDER_H_
 #define COMPONENTS_POLICY_CORE_COMMON_CLOUD_POLICY_BUILDER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 71 matching lines @@
 
   // These return hard-coded testing keys. Don't use in production!
   static scoped_ptr<crypto::RSAPrivateKey> CreateTestSigningKey();
   static scoped_ptr<crypto::RSAPrivateKey> CreateTestOtherSigningKey();
 
   // Verification signatures for the two hard-coded testing keys above. These
   // signatures are valid only for the kFakeDomain domain.
   static std::string GetTestSigningKeySignature();
   static std::string GetTestOtherSigningKeySignature();
 
+  std::vector<uint8> raw_signing_key() { return raw_signing_key_; }
+  std::vector<uint8> raw_new_signing_key() { return raw_new_signing_key_; }

[Mattias Nissler (ping if slow), 2014/02/13 10:52:53]

nit: newline

[Andrew T Wilson (Slow), 2014/02/13 12:15:36]

Done.

  private:
   // Produces |key|'s signature over |data| and stores it in |signature|.
   void SignData(const std::string& data,
                 crypto::RSAPrivateKey* key,
                 std::string* signature);
 
   enterprise_management::PolicyFetchResponse policy_;
   scoped_ptr<enterprise_management::PolicyData> policy_data_;
   std::string payload_data_;
 
   // The keys cannot be stored in NSS. Temporary keys are not guaranteed to
   // remain in the database. Persistent keys require a persistent database,
   // which would coincide with the user's database. However, these keys are used
   // for signing the policy and don't have to coincide with the user's known
   // keys. Instead, we store the private keys as raw bytes. Where needed, a
   // temporary RSAPrivateKey is created.
   std::vector<uint8> raw_signing_key_;
   std::vector<uint8> raw_new_signing_key_;
+  std::string raw_new_signing_key_signature_;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyBuilder);
 };
 
 // Type-parameterized PolicyBuilder extension that allows for building policy
 // blobs carrying protobuf payloads.
 template<typename PayloadProto>
 class TypedPolicyBuilder : public PolicyBuilder {
  public:
   TypedPolicyBuilder();
@@ skipping 27 matching lines @@
     UserPolicyBuilder;
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 typedef TypedPolicyBuilder<enterprise_management::ExternalPolicyData>
     ComponentPolicyBuilder;
 #endif
 
 }  // namespace policy
 
 #endif  // COMPONENTS_POLICY_CORE_COMMON_CLOUD_POLICY_BUILDER_H_