Extending ONC validator's logging. Completing toplevel validation.

chromeos/network/onc/onc_signature.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/onc/onc_signature.h"
 
 #include "chromeos/network/onc/onc_constants.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using base::Value;
@@ skipping 10 matching lines @@
 };
 const OncValueSignature kIntegerSignature = {
   Value::TYPE_INTEGER, NULL
 };
 const OncValueSignature kStringListSignature = {
   Value::TYPE_LIST, NULL, &kStringSignature
 };
 const OncValueSignature kIPConfigListSignature = {
   Value::TYPE_LIST, NULL, &kIPConfigSignature
 };
-const OncValueSignature kCertificateListSignature = {
-  Value::TYPE_LIST, NULL, &kCertificateSignature
-};
-const OncValueSignature kNetworkConfigurationListSignature = {
-  Value::TYPE_LIST, NULL, &kNetworkConfigurationSignature
-};
 
 const OncFieldSignature issuer_subject_pattern_fields[] = {
   { certificate::kCommonName, NULL, &kStringSignature },
   { certificate::kLocality, NULL, &kStringSignature },
   { certificate::kOrganization, NULL, &kStringSignature },
   { certificate::kOrganizationalUnit, NULL, &kStringSignature },
   { NULL }
 };
 
 const OncFieldSignature certificate_pattern_fields[] = {
@@ skipping 182 matching lines @@
 const OncFieldSignature certificate_fields[] = {
   { kGUID, flimflam::kGuidProperty, &kStringSignature },
   { certificate::kPKCS12, NULL, &kStringSignature },
   { kRemove, NULL, &kBoolSignature },
   { certificate::kTrust, NULL, &kStringListSignature },
   { kType, NULL, &kStringSignature },
   { certificate::kX509, NULL, &kStringSignature },
   { NULL }
 };
 
-const OncFieldSignature unencrypted_configuration_fields[] = {
+const OncFieldSignature toplevel_configuration_fields[] = {
   { kCertificates, NULL, &kCertificateListSignature },
   { kNetworkConfigurations, NULL, &kNetworkConfigurationListSignature },
   { kType, NULL, &kStringSignature },
+  { encrypted::kCipher, NULL, &kStringSignature },
+  { encrypted::kCiphertext, NULL, &kStringSignature },
+  { encrypted::kHMAC, NULL, &kStringSignature },
+  { encrypted::kHMACMethod, NULL, &kStringSignature },
+  { encrypted::kIV, NULL, &kStringSignature },
+  { encrypted::kIterations, NULL, &kIntegerSignature },
+  { encrypted::kSalt, NULL, &kStringSignature },
+  { encrypted::kStretch, NULL, &kStringSignature },
   { NULL }
 };
 
 }  // namespace
 
 const OncValueSignature kRecommendedSignature = {
   Value::TYPE_LIST, NULL, &kStringSignature
 };
 const OncValueSignature kEAPSignature = {
   Value::TYPE_DICTIONARY, eap_fields, NULL
@@ skipping 33 matching lines @@
 };
 const OncValueSignature kWiFiSignature = {
   Value::TYPE_DICTIONARY, wifi_fields, NULL
 };
 const OncValueSignature kCertificateSignature = {
   Value::TYPE_DICTIONARY, certificate_fields, NULL
 };
 const OncValueSignature kNetworkConfigurationSignature = {
   Value::TYPE_DICTIONARY, network_configuration_fields, NULL
 };
-const OncValueSignature kUnencryptedConfigurationSignature = {
-  Value::TYPE_DICTIONARY, unencrypted_configuration_fields, NULL
+const OncValueSignature kCertificateListSignature = {
+  Value::TYPE_LIST, NULL, &kCertificateSignature
+};
+const OncValueSignature kNetworkConfigurationListSignature = {
+  Value::TYPE_LIST, NULL, &kNetworkConfigurationSignature
+};
+const OncValueSignature kToplevelConfigurationSignature = {
+  Value::TYPE_DICTIONARY, toplevel_configuration_fields, NULL
 };
 
 const OncFieldSignature* GetFieldSignature(const OncValueSignature& signature,
                                            const std::string& onc_field_name) {
   if (!signature.fields)
     return NULL;
   for (const OncFieldSignature* field_signature = signature.fields;
        field_signature->onc_field_name != NULL; ++field_signature) {
     if (onc_field_name == field_signature->onc_field_name)
       return field_signature;
   }
   return NULL;
 }
 
 }  // namespace onc
 }  // namespace chromeos