diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-16 20:41:46 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-16 20:41:46 +0000 |
| commit | 6d0f4901873c0a61775dfcb1526e572faf9bac64 (patch) | |
| tree | bce215e107fc45d6953a3f91c3f2de24ddeb6ba5 /chromeos/network/onc/onc_signature.cc | |
| parent | 62f18e79afcf0a1013f3754f5a603a86f79a5ccf (diff) | |
| download | chromium_src-6d0f4901873c0a61775dfcb1526e572faf9bac64.zip chromium_src-6d0f4901873c0a61775dfcb1526e572faf9bac64.tar.gz chromium_src-6d0f4901873c0a61775dfcb1526e572faf9bac64.tar.bz2 | |
Extending ONC validator's logging. Completing toplevel validation.
Adding also more validation tests.
The logging is in line with https://codereview.chromium.org/11299236/.
BUG=162802
TEST=Unit tests.
TBR=stevenjb@chromium.org,eroman@chromium.org (whitespace change in net_interals.cc)
Review URL: https://chromiumcodereview.appspot.com/11469026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173393 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/network/onc/onc_signature.cc')
| -rw-r--r-- | chromeos/network/onc/onc_signature.cc | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc index f71328c..974df42 100644 --- a/chromeos/network/onc/onc_signature.cc +++ b/chromeos/network/onc/onc_signature.cc @@ -28,12 +28,6 @@ const OncValueSignature kStringListSignature = { 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 }, @@ -236,10 +230,18 @@ const OncFieldSignature certificate_fields[] = { { 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 } }; @@ -293,8 +295,14 @@ const OncValueSignature kCertificateSignature = { 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, |