summaryrefslogtreecommitdiffstats
path: root/chrome/app/policy
diff options
context:
space:
mode:
authordkrahn@google.com <dkrahn@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-22 10:12:06 +0000
committerdkrahn@google.com <dkrahn@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-22 10:12:06 +0000
commitce1f9de7437e0a182315313d292bec5f680215fc (patch)
tree875c5ce1fbd07a244dd4406dac164c5c59e59523 /chrome/app/policy
parentef28aa5f3f4b3cab6b8881dc86bfa8a77e19f036 (diff)
downloadchromium_src-ce1f9de7437e0a182315313d292bec5f680215fc.zip
chromium_src-ce1f9de7437e0a182315313d292bec5f680215fc.tar.gz
chromium_src-ce1f9de7437e0a182315313d292bec5f680215fc.tar.bz2
Added a device policy: attestation for protected content.
BUG=chromium:270316 TEST=unit, manual Review URL: https://chromiumcodereview.appspot.com/23311007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/policy')
-rw-r--r--chrome/app/policy/policy_templates.json20
1 files changed, 19 insertions, 1 deletions
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index 4bbb89c0..c4444fb 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -117,7 +117,7 @@
# persistent IDs for all fields (but not for groups!) are needed. These are
# specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs,
# because doing so would break the deployed wire format!
-# For your editing convenience: highest ID currently used: 238
+# For your editing convenience: highest ID currently used: 239
#
# Placeholders:
# The following placeholder strings are automatically substituted:
@@ -5313,6 +5313,24 @@
If an extension is not in the list, or the list is not set, the call to the API will fail with an error code.''',
},
+ {
+ 'name': 'AttestationForContentProtectionEnabled',
+ 'type': 'main',
+ 'schema': { 'type': 'boolean' },
+ 'supported_on': ['chrome_os:31-'],
+ 'features': {
+ 'dynamic_refresh': True,
+ },
+ 'device_only': True,
+ 'example_value': True,
+ 'id': 239,
+ 'caption': '''Enable the use of remote attestation for content protection for the device.''',
+ 'desc': '''Chrome OS devices can use remote attestation (Verified Access) to get a certificate issued by the Chrome OS CA that asserts the device is eligible to play protected content. This process involves sending hardware endorsement information to the Chrome OS CA which uniquely identifies the device.
+
+ If this setting is false, the device will not use remote attestation for content protection and the device may be unable to play protected content.
+
+ If this setting is true, or if it is not set, remote attestation may be used for content protection.''',
+ },
],
},
{