summaryrefslogtreecommitdiffstats
path: root/chromeos/network/onc/onc_utils.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromeos/network/onc/onc_utils.cc')
-rw-r--r--chromeos/network/onc/onc_utils.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chromeos/network/onc/onc_utils.cc b/chromeos/network/onc/onc_utils.cc
index 62e0d46..85cfe64 100644
--- a/chromeos/network/onc/onc_utils.cc
+++ b/chromeos/network/onc/onc_utils.cc
@@ -27,6 +27,10 @@ const char kUnableToDecode[] = "Unable to decode encrypted ONC";
} // namespace
+const char kEmptyUnencryptedConfiguration[] =
+ "{\"Type\":\"UnencryptedConfiguration\",\"NetworkConfigurations\":[],"
+ "\"Certificates\":[]}";
+
scoped_ptr<base::DictionaryValue> ReadDictionaryFromJson(
const std::string& json) {
std::string error;
@@ -64,7 +68,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) {
ONC_LOG_ERROR("Encrypted ONC malformed.");