Update policy signature verification to include policy domain.

components/policy/proto/device_management_backend.proto

Index: components/policy/proto/device_management_backend.proto
diff --git a/components/policy/proto/device_management_backend.proto b/components/policy/proto/device_management_backend.proto
index 2908a7998f41e6d8ec10e8140d7386a203d50406..e55994be04bc44a1c23aa51a487d42f31d066479 100644
--- a/components/policy/proto/device_management_backend.proto
+++ b/components/policy/proto/device_management_backend.proto
@@ -297,13 +297,13 @@ message PolicyFetchResponse {
   optional bytes new_public_key_signature = 6;
 
   // If new_public_key is specified, this field contains a signature
-  // of that key, signed using a key only available to DMServer.  
-  // The public key portion of this well-known key is embedded into the
-  // Chrome binary. The hash of that embedded key is passed to DMServer
-  // as verification_key_hash field in PolicyFetchRequest. DMServer will
-  // pick a private key on the server which matches the hash (matches public
-  // key on the client). If DMServer is unable to find matching key, it will
-  // return an error instead of policy data.
+  // of a PolicyPublicKeyAndDomain protobuf, signed using a key only
+  // available to DMServer. The public key portion of this well-known key is
+  // embedded into the Chrome binary. The hash of that embedded key is passed
+  // to DMServer as verification_key_hash field in PolicyFetchRequest. DMServer
+  // will pick a private key on the server which matches the hash (matches
+  // public key on the client). If DMServer is unable to find matching key, it
+  // will return an error instead of policy data.
   // In case hash was not specified, DMServer will leave verification signature
   // field empty (legacy behavior).  
   // In addition to the checks between new_public_key
@@ -313,6 +313,16 @@ message PolicyFetchResponse {
   optional bytes new_public_key_verification_signature = 7;
 }
 
+// Protobuf used to generate the new_public_key_verification_signature field.
+message PolicyPublicKeyAndDomain {
+  // The public key to sign (taken from the |new_public_key| field in
+  // PolicyFetchResponse).
+  optional bytes new_public_key = 1;

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

nit: newline

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

Done.

+  // The domain associated with this key (should match the domain portion of
+  // the username field of the policy).
+  optional string domain = 2;
+}
+
 // Request from device to server for reading policies.
 message DevicePolicyRequest {
   // The policy fetch request.  If this field exists, the request must