OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/policy/device_local_account_policy_store.h" | 5 #include "chrome/browser/chromeos/policy/device_local_account_policy_store.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "chromeos/dbus/power_policy_controller.h" | 10 #include "chromeos/dbus/power_policy_controller.h" |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 // The timestamp is verified when storing a new policy downloaded from the | 183 // The timestamp is verified when storing a new policy downloaded from the |
184 // server but not when loading a cached policy from disk. | 184 // server but not when loading a cached policy from disk. |
185 // See SessionManagerOperation::ValidateDeviceSettings for the rationale. | 185 // See SessionManagerOperation::ValidateDeviceSettings for the rationale. |
186 validator->ValidateAgainstCurrentPolicy( | 186 validator->ValidateAgainstCurrentPolicy( |
187 policy(), | 187 policy(), |
188 valid_timestamp_required | 188 valid_timestamp_required |
189 ? CloudPolicyValidatorBase::TIMESTAMP_REQUIRED | 189 ? CloudPolicyValidatorBase::TIMESTAMP_REQUIRED |
190 : CloudPolicyValidatorBase::TIMESTAMP_NOT_REQUIRED, | 190 : CloudPolicyValidatorBase::TIMESTAMP_NOT_REQUIRED, |
191 CloudPolicyValidatorBase::DM_TOKEN_REQUIRED); | 191 CloudPolicyValidatorBase::DM_TOKEN_REQUIRED); |
192 validator->ValidatePayload(); | 192 validator->ValidatePayload(); |
193 validator->ValidateSignature(*key->public_key(), false); | 193 validator->ValidateSignature(key->public_key_as_string(), |
| 194 GetPolicyVerificationKey(), |
| 195 std::string(), |
| 196 false); |
194 validator.release()->StartValidation(callback); | 197 validator.release()->StartValidation(callback); |
195 } | 198 } |
196 | 199 |
197 } // namespace policy | 200 } // namespace policy |
OLD | NEW |