Index: chromeos/network/onc/onc_utils.cc |
diff --git a/chromeos/network/onc/onc_utils.cc b/chromeos/network/onc/onc_utils.cc |
index 62e0d4682ace119565c61e0be4b9eba297f7a1ec..85cfe640d90e068d5fc9e790ba03631b2cce55d7 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."); |