Resolve certificate references in ONC by PEM.

chromeos/network/onc/onc_constants.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_constants.h"
 
 namespace chromeos {
 
 // Constants for ONC properties.
 namespace onc {
@@ skipping 122 matching lines @@
 }  // namespace wifi
 
 namespace certificate {
 const char kAuthority[] = "Authority";
 const char kClient[] = "Client";
 const char kCommonName[] = "CommonName";
 const char kEmailAddress[] = "EmailAddress";
 const char kEnrollmentURI[] = "EnrollmentURI";
 const char kGUID[] = "GUID";
 const char kIssuerCARef[] = "IssuerCARef";
+const char kIssuerCAPEMs[] = "IssuerCAPEMs";
 const char kIssuer[] = "Issuer";
 const char kLocality[] = "Locality";
 const char kNone[] = "None";
 const char kOrganization[] = "Organization";
 const char kOrganizationalUnit[] = "OrganizationalUnit";
 const char kPKCS12[] = "PKCS12";
 const char kPattern[] = "Pattern";
 const char kRef[] = "Ref";
 const char kServer[] = "Server";
 const char kSubject[] = "Subject";
@@ skipping 32 matching lines @@
 const char kIdentity[] = "Identity";
 const char kInner[] = "Inner";
 const char kLEAP[] = "LEAP";
 const char kMD5[] = "MD5";
 const char kMSCHAPv2[] = "MSCHAPv2";
 const char kOuter[] = "Outer";
 const char kPAP[] = "PAP";
 const char kPEAP[] = "PEAP";
 const char kPassword[] = "Password";
 const char kSaveCredentials[] = "SaveCredentials";
+const char kServerCAPEMs[] = "ServerCAPEMs";
 const char kServerCARef[] = "ServerCARef";
 const char kUseSystemCAs[] = "UseSystemCAs";
 }  // namespace eap
 
 namespace vpn {
 const char kAuthNoCache[] = "AuthNoCache";
 const char kAuthRetry[] = "AuthRetry";
 const char kAuth[] = "Auth";
-const char kAuthenticationType[] = "AuthenticationType";
 const char kAutoConnect[] = "AutoConnect";
-const char kCert[] = "Cert";
 const char kCipher[] = "Cipher";
 const char kClientCertPattern[] = "ClientCertPattern";
 const char kClientCertRef[] = "ClientCertRef";
 const char kClientCertType[] = "ClientCertType";
 const char kCompLZO[] = "CompLZO";
 const char kCompNoAdapt[] = "CompNoAdapt";
-const char kEAP[] = "EAP";
-const char kGroup[] = "Group";
 const char kHost[] = "Host";
-const char kIKEVersion[] = "IKEVersion";
 const char kIPsec[] = "IPsec";
 const char kKeyDirection[] = "KeyDirection";
 const char kL2TP[] = "L2TP";
 const char kNsCertType[] = "NsCertType";
 const char kOpenVPN[] = "OpenVPN";
-const char kPSK[] = "PSK";
 const char kPassword[] = "Password";
 const char kPort[] = "Port";
 const char kProto[] = "Proto";
 const char kPushPeerInfo[] = "PushPeerInfo";
 const char kRemoteCertEKU[] = "RemoteCertEKU";
 const char kRemoteCertKU[] = "RemoteCertKU";
 const char kRemoteCertTLS[] = "RemoteCertTLS";
 const char kRenegSec[] = "RenegSec";
 const char kSaveCredentials[] = "SaveCredentials";
-const char kServerCARef[] = "ServerCARef";
+const char kServerCertPEM[] = "ServerCertPEM";
 const char kServerCertRef[] = "ServerCertRef";
 const char kServerPollTimeout[] = "ServerPollTimeout";
 const char kShaper[] = "Shaper";
 const char kStaticChallenge[] = "StaticChallenge";
 const char kTLSAuthContents[] = "TLSAuthContents";
 const char kTLSRemote[] = "TLSRemote";
 const char kTypeL2TP_IPsec[] = "L2TP-IPsec";
 const char kType[] = "Type";
 const char kUsername[] = "Username";
 const char kVerb[] = "Verb";
-const char kXAUTH[] = "XAUTH";
 }  // namespace vpn
 
+namespace ipsec {

[Mattias Nissler (ping if slow), 2013/07/02 13:00:35]

You should really try and break these unrelated changes out into separate CLs.

[pneubeck (no reviews), 2013/07/02 14:38:43]

Done.

+const char kAuthenticationType[] = "AuthenticationType";
+const char kCert[] = "Cert";
+const char kEAP[] = "EAP";
+const char kGroup[] = "Group";
+const char kIKEVersion[] = "IKEVersion";
+const char kPSK[] = "PSK";
+const char kServerCAPEMs[] = "ServerCAPEMs";
+const char kServerCARef[] = "ServerCARef";
+const char kXAUTH[] = "XAUTH";
+}  // namespace ipsec
+
 namespace openvpn {
-const char kNone[] = "none";
 const char kInteract[] = "interact";
 const char kNoInteract[] = "nointeract";
+const char kNone[] = "none";
+const char kServerCAPEMs[] = "ServerCAPEMs";
+const char kServerCARef[] = "ServerCARef";
 const char kServer[] = "server";
 }  // namespace openvpn
 
 namespace proxy {
 const char kDirect[] = "Direct";
 const char kExcludeDomains[] = "ExcludeDomains";
 const char kFtp[] = "FTPProxy";
 const char kHost[] = "Host";
 const char kHttp[] = "HTTPProxy";
 const char kHttps[] = "SecureHTTPProxy";
 const char kManual[] = "Manual";
 const char kPAC[] = "PAC";
 const char kPort[] = "Port";
 const char kSocks[] = "SOCKS";
 const char kType[] = "Type";
 const char kWPAD[] = "WPAD";
 }  // namespace proxy
 
 namespace substitutes {
 const char kLoginIDField[] = "${LOGIN_ID}";
 const char kEmailField[] = "${LOGIN_EMAIL}";
 }  // namespace substitutes
 
 }  // namespace onc
 
 }  // namespace chromeos