ONC: Cleanup client certificate related fields.

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 "components/onc/onc_constants.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using base::Value;
@@ skipping 18 matching lines @@
   base::Value::TYPE_LIST, NULL, &kIntegerSignature
 };
 const OncValueSignature kIPConfigListSignature = {
   base::Value::TYPE_LIST, NULL, &kIPConfigSignature
 };
 const OncValueSignature kCellularApnListSignature = {
   base::Value::TYPE_LIST, NULL, &kCellularApnSignature
 };
 
 const OncFieldSignature issuer_subject_pattern_fields[] = {
-    { ::onc::certificate::kCommonName, &kStringSignature},
-    { ::onc::certificate::kLocality, &kStringSignature},
-    { ::onc::certificate::kOrganization, &kStringSignature},
-    { ::onc::certificate::kOrganizationalUnit, &kStringSignature},
+    { ::onc::client_cert::kCommonName, &kStringSignature},
+    { ::onc::client_cert::kLocality, &kStringSignature},
+    { ::onc::client_cert::kOrganization, &kStringSignature},
+    { ::onc::client_cert::kOrganizationalUnit, &kStringSignature},
     {NULL}};
 
 const OncFieldSignature certificate_pattern_fields[] = {
     { ::onc::kRecommended, &kRecommendedSignature},
-    { ::onc::certificate::kEnrollmentURI, &kStringListSignature},
-    { ::onc::certificate::kIssuer, &kIssuerSubjectPatternSignature},
-    { ::onc::certificate::kIssuerCARef, &kStringListSignature},
+    { ::onc::client_cert::kEnrollmentURI, &kStringListSignature},
+    { ::onc::client_cert::kIssuer, &kIssuerSubjectPatternSignature},
+    { ::onc::client_cert::kIssuerCARef, &kStringListSignature},
     // Used internally. Not officially supported.
-    { ::onc::certificate::kIssuerCAPEMs, &kStringListSignature},
-    { ::onc::certificate::kSubject, &kIssuerSubjectPatternSignature},
+    { ::onc::client_cert::kIssuerCAPEMs, &kStringListSignature},
+    { ::onc::client_cert::kSubject, &kIssuerSubjectPatternSignature},
     {NULL}};
 
 const OncFieldSignature eap_fields[] = {
     { ::onc::kRecommended, &kRecommendedSignature},
     { ::onc::eap::kAnonymousIdentity, &kStringSignature},
-    { ::onc::eap::kClientCertPattern, &kCertificatePatternSignature},
-    { ::onc::eap::kClientCertRef, &kStringSignature},
-    { ::onc::eap::kClientCertType, &kStringSignature},
+    { ::onc::client_cert::kClientCertPattern, &kCertificatePatternSignature},
+    { ::onc::client_cert::kClientCertRef, &kStringSignature},
+    { ::onc::client_cert::kClientCertType, &kStringSignature},
     { ::onc::eap::kIdentity, &kStringSignature},
     { ::onc::eap::kInner, &kStringSignature},
     { ::onc::eap::kOuter, &kStringSignature},
     { ::onc::eap::kPassword, &kStringSignature},
     { ::onc::eap::kSaveCredentials, &kBoolSignature},
     // Used internally. Not officially supported.
     { ::onc::eap::kServerCAPEMs, &kStringListSignature},
     { ::onc::eap::kServerCARef, &kStringSignature},
     { ::onc::eap::kServerCARefs, &kStringListSignature},
     { ::onc::eap::kUseSystemCAs, &kBoolSignature},
     {NULL}};
 
 const OncFieldSignature ipsec_fields[] = {
     { ::onc::kRecommended, &kRecommendedSignature},
     { ::onc::ipsec::kAuthenticationType, &kStringSignature},
-    { ::onc::vpn::kClientCertPattern, &kCertificatePatternSignature},
-    { ::onc::vpn::kClientCertRef, &kStringSignature},
-    { ::onc::vpn::kClientCertType, &kStringSignature},
+    { ::onc::client_cert::kClientCertPattern, &kCertificatePatternSignature},
+    { ::onc::client_cert::kClientCertRef, &kStringSignature},
+    { ::onc::client_cert::kClientCertType, &kStringSignature},
     { ::onc::ipsec::kGroup, &kStringSignature},
     { ::onc::ipsec::kIKEVersion, &kIntegerSignature},
     { ::onc::ipsec::kPSK, &kStringSignature},
     { ::onc::vpn::kSaveCredentials, &kBoolSignature},
     // Used internally. Not officially supported.
     { ::onc::ipsec::kServerCAPEMs, &kStringListSignature},
     { ::onc::ipsec::kServerCARef, &kStringSignature},
     { ::onc::ipsec::kServerCARefs, &kStringListSignature},
     { ::onc::ipsec::kXAUTH, &kXAUTHSignature},
     // Not yet supported.
@@ skipping 11 matching lines @@
     { ::onc::vpn::kSaveCredentials, &kBoolSignature},
     { ::onc::vpn::kUsername, &kStringSignature},
     {NULL}};
 
 const OncFieldSignature openvpn_fields[] = {
     { ::onc::kRecommended, &kRecommendedSignature},
     { ::onc::openvpn::kAuth, &kStringSignature},
     { ::onc::openvpn::kAuthNoCache, &kBoolSignature},
     { ::onc::openvpn::kAuthRetry, &kStringSignature},
     { ::onc::openvpn::kCipher, &kStringSignature},
-    { ::onc::vpn::kClientCertPattern, &kCertificatePatternSignature},
-    { ::onc::vpn::kClientCertRef, &kStringSignature},
-    { ::onc::vpn::kClientCertType, &kStringSignature},
+    { ::onc::client_cert::kClientCertPattern, &kCertificatePatternSignature},
+    { ::onc::client_cert::kClientCertRef, &kStringSignature},
+    { ::onc::client_cert::kClientCertType, &kStringSignature},
     { ::onc::openvpn::kCompLZO, &kStringSignature},
     { ::onc::openvpn::kCompNoAdapt, &kBoolSignature},
     { ::onc::openvpn::kIgnoreDefaultRoute, &kBoolSignature},
     { ::onc::openvpn::kKeyDirection, &kStringSignature},
     { ::onc::openvpn::kNsCertType, &kStringSignature},
     { ::onc::vpn::kPassword, &kStringSignature},
     { ::onc::openvpn::kPort, &kIntegerSignature},
     { ::onc::openvpn::kProto, &kStringSignature},
     { ::onc::openvpn::kPushPeerInfo, &kBoolSignature},
     { ::onc::openvpn::kRemoteCertEKU, &kStringSignature},
@@ skipping 328 matching lines @@
     if (&signature == entry->value_signature &&
         onc_field_name == entry->field_name) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace onc
 }  // namespace chromeos