Resolve certificate references in ONC by PEM.

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 27 matching lines @@
   { certificate::kOrganization, &kStringSignature },
   { certificate::kOrganizationalUnit, &kStringSignature },
   { NULL }
 };
 
 const OncFieldSignature certificate_pattern_fields[] = {
   { kRecommended, &kRecommendedSignature },
   { certificate::kEnrollmentURI, &kStringListSignature },
   { certificate::kIssuer, &kIssuerSubjectPatternSignature },
   { certificate::kIssuerCARef, &kStringListSignature },
+  { certificate::kIssuerCAPEMs, &kStringListSignature },
   { certificate::kSubject, &kIssuerSubjectPatternSignature },
   { NULL }
 };
 
 const OncFieldSignature eap_fields[] = {
   { kRecommended, &kRecommendedSignature },
   { eap::kAnonymousIdentity, &kStringSignature },
   { eap::kClientCertPattern, &kCertificatePatternSignature },
   { eap::kClientCertRef, &kStringSignature },
   { eap::kClientCertType, &kStringSignature },
   { eap::kIdentity, &kStringSignature },
   { eap::kInner, &kStringSignature },
   { eap::kOuter, &kStringSignature },
   { eap::kPassword, &kStringSignature },
   { eap::kSaveCredentials, &kBoolSignature },
+  { eap::kServerCAPEMs, &kStringListSignature },
   { eap::kServerCARef, &kStringSignature },
   { eap::kUseSystemCAs, &kBoolSignature },
   { NULL }
 };
 
 const OncFieldSignature ipsec_fields[] = {
   { kRecommended, &kRecommendedSignature },
-  { vpn::kAuthenticationType, &kStringSignature },
+  { ipsec::kAuthenticationType, &kStringSignature },
   { vpn::kClientCertPattern, &kCertificatePatternSignature },
   { vpn::kClientCertRef, &kStringSignature },
   { vpn::kClientCertType, &kStringSignature },
-  { vpn::kGroup, &kStringSignature },
-  { vpn::kIKEVersion, &kIntegerSignature },
-  { vpn::kPSK, &kStringSignature },
+  { ipsec::kGroup, &kStringSignature },
+  { ipsec::kIKEVersion, &kIntegerSignature },
+  { ipsec::kPSK, &kStringSignature },
   { vpn::kSaveCredentials, &kBoolSignature },
-  { vpn::kServerCARef, &kStringSignature },
+  { ipsec::kServerCAPEMs, &kStringSignature },
+  { ipsec::kServerCARef, &kStringSignature },
   // Not yet supported.
-  //  { vpn::kEAP, &kEAPSignature },
-  //  { vpn::kXAUTH, &kXAUTHSignature },
+  //  { ipsec::kEAP, &kEAPSignature },
+  //  { ipsec::kXAUTH, &kXAUTHSignature },
   { NULL }
 };
 
 const OncFieldSignature l2tp_fields[] = {
   { kRecommended, &kRecommendedSignature },
   { vpn::kPassword, &kStringSignature },
   { vpn::kSaveCredentials, &kBoolSignature },
   { vpn::kUsername, &kStringSignature },
   { NULL }
 };
@@ skipping 13 matching lines @@
   { vpn::kNsCertType, &kStringSignature },
   { vpn::kPassword, &kStringSignature },
   { vpn::kPort, &kIntegerSignature },
   { vpn::kProto, &kStringSignature },
   { vpn::kPushPeerInfo, &kBoolSignature },
   { vpn::kRemoteCertEKU, &kStringSignature },
   { vpn::kRemoteCertKU, &kStringListSignature },
   { vpn::kRemoteCertTLS, &kStringSignature },
   { vpn::kRenegSec, &kIntegerSignature },
   { vpn::kSaveCredentials, &kBoolSignature },
-  { vpn::kServerCARef, &kStringSignature },
+  { openvpn::kServerCAPEMs, &kStringListSignature },
+  { openvpn::kServerCARef, &kStringSignature },
   // Not supported, yet.
+  { vpn::kServerCertPEM, &kStringSignature },
   { vpn::kServerCertRef, &kStringSignature },
   { vpn::kServerPollTimeout, &kIntegerSignature },
   { vpn::kShaper, &kIntegerSignature },
   { vpn::kStaticChallenge, &kStringSignature },
   { vpn::kTLSAuthContents, &kStringSignature },
   { vpn::kTLSRemote, &kStringSignature },
   { vpn::kUsername, &kStringSignature },
   // Not supported, yet.
   { vpn::kVerb, &kStringSignature },
   { NULL }
@@ skipping 247 matching lines @@
 
 namespace {
 
 struct CredentialEntry {
   const OncValueSignature* value_signature;
   const char* field_name;
 };
 
 const CredentialEntry credentials[] = {
   { &kEAPSignature, onc::eap::kPassword },
-  { &kIPsecSignature, onc::vpn::kPSK },
+  { &kIPsecSignature, onc::ipsec::kPSK },
   { &kL2TPSignature, onc::vpn::kPassword },
   { &kOpenVPNSignature, onc::vpn::kPassword },
   { &kOpenVPNSignature, onc::vpn::kTLSAuthContents },
   { &kWiFiSignature, onc::wifi::kPassphrase },
   { NULL }
 };
 
 }  // namespace
 
 bool FieldIsCredential(const OncValueSignature& signature,
                        const std::string& onc_field_name) {
   for (const CredentialEntry* entry = credentials;
        entry->value_signature != NULL; ++entry) {
     if (&signature == entry->value_signature &&
         onc_field_name == entry->field_name) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace onc
 }  // namespace chromeos