Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(538)

Unified Diff: chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc

Issue 116273002: Added support for signed policy blobs on desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup from self-review + cros clang fix. Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc
index 16468bb595e62e91ed910a72f2f748c0c216225d..0c0934b1282a09a9a2cf15e88d7c171c4f17872f 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc
@@ -46,7 +46,11 @@ void DeviceCloudPolicyStoreChromeOS::Store(
}
scoped_ptr<DeviceCloudPolicyValidator> validator(CreateValidator(policy));
- validator->ValidateSignature(*owner_key->public_key(), true);
+
+ validator->ValidateSignature(owner_key->public_key_as_string(),
+ GetPolicyVerificationKey(),
Mattias Nissler (ping if slow) 2014/01/27 13:52:13 So we actually do verification for Chrome OS? Didn
Andrew T Wilson (Slow) 2014/01/30 17:10:31 The plumbing is in place, but GetPolicyVerificatio
+ std::string(),
+ true);
validator->ValidateAgainstCurrentPolicy(
device_settings_service_->policy_data(),
CloudPolicyValidatorBase::TIMESTAMP_REQUIRED,
@@ -74,7 +78,7 @@ void DeviceCloudPolicyStoreChromeOS::InstallInitialPolicy(
}
scoped_ptr<DeviceCloudPolicyValidator> validator(CreateValidator(policy));
- validator->ValidateInitialKey();
+ validator->ValidateInitialKey(GetPolicyVerificationKey());
validator.release()->StartValidation(
base::Bind(&DeviceCloudPolicyStoreChromeOS::OnPolicyToStoreValidated,
weak_factory_.GetWeakPtr()));

Powered by Google App Engine
This is Rietveld 408576698