chrome/browser/policy/configuration_policy_handler_chromeos.cc - Issue 8949056: This adds support for encrypted ONC import

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/policy/configuration_policy_handler_chromeos.cc

Issue 8949056: This adds support for encrypted ONC import (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed merge Created 8 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:

Index: chrome/browser/policy/configuration_policy_handler_chromeos.cc

diff --git a/chrome/browser/policy/configuration_policy_handler_chromeos.cc b/chrome/browser/policy/configuration_policy_handler_chromeos.cc

index 8c0f1d8ae4be8139ec26698f24e9fea9e920880f..58e4457d373e808a6feaff46a57260df38a2a98f 100644

--- a/chrome/browser/policy/configuration_policy_handler_chromeos.cc

+++ b/chrome/browser/policy/configuration_policy_handler_chromeos.cc

@@ -35,7 +35,8 @@ bool NetworkConfigurationPolicyHandler::CheckPolicySettings(

if (value) {

std::string onc_blob;

value->GetAsString(&onc_blob);

- chromeos::OncNetworkParser parser(onc_blob, onc_source_);

+ // Policy-based ONC blobs cannot have a passphrase.

+ chromeos::OncNetworkParser parser(onc_blob, "", onc_source_);

if (!parser.parse_error().empty()) {

errors->AddError(policy_type(),

IDS_POLICY_NETWORK_CONFIG_PARSE_ERROR,

« no previous file with comments | « chrome/browser/chromeos/cros/onc_network_parser_unittest.cc ('k') | crypto/hmac.h » ('j') | no next file with comments »