chrome/browser/chromeos/network_settings/onc_utils.cc - Issue 11469026: Extending ONC validator's logging. Completing toplevel validation.

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/chromeos/network_settings/onc_utils.cc

Issue 11469026: Extending ONC validator's logging. Completing toplevel validation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@add_error_handling_to_validator

Patch Set: Initial patch. Created 8 years 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

« chrome/browser/chromeos/network_settings/onc_mapper.h ('K') | « chrome/browser/chromeos/network_settings/onc_utils.h ('k') | chrome/browser/chromeos/network_settings/onc_validator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/network_settings/onc_utils.cc

diff --git a/chrome/browser/chromeos/network_settings/onc_utils.cc b/chrome/browser/chromeos/network_settings/onc_utils.cc

index 9b57cbe97dafd4aeaff16cd65906b443781dba6d..a3ea7c5242398b00047b07b3f259dab16692e722 100644

--- a/chrome/browser/chromeos/network_settings/onc_utils.cc

+++ b/chrome/browser/chromeos/network_settings/onc_utils.cc

@@ -17,6 +17,10 @@

namespace chromeos {

namespace onc {

+const char kEmptyUnencryptedConfiguration[] =

+ "{\"Type\":\"UnencryptedConfiguration\",\"NetworkConfigurations\":[],"

+ "\"Certificates\":[]}";

scoped_ptr<base::DictionaryValue> ReadDictionaryFromJson(

const std::string& json,

std::string* error) {

@@ -58,7 +62,7 @@ scoped_ptr<base::DictionaryValue> Decrypt(const std::string& passphrase,

!root.GetInteger(encrypted::kIterations, &iterations) ||

!root.GetString(encrypted::kSalt, &salt) ||

!root.GetString(encrypted::kStretch, &stretch_method) ||

- !root.GetString(encrypted::kType, &onc_type) ||

+ !root.GetString(kType, &onc_type) ||

onc_type != kEncryptedConfiguration) {

*error = l10n_util::GetStringUTF8(

IDS_NETWORK_CONFIG_ERROR_ENCRYPTED_ONC_MALFORMED);