Resolve certificate references in ONC by PEM.

chromeos/network/onc/onc_constants.cc

Index: chromeos/network/onc/onc_constants.cc
diff --git a/chromeos/network/onc/onc_constants.cc b/chromeos/network/onc/onc_constants.cc
index 46414bfd9e1b9c011ef69cda5249d8ce8e8f08bc..8d25eebb96614cb589b6095c0f52dd16ebe5d0e4 100644
--- a/chromeos/network/onc/onc_constants.cc
+++ b/chromeos/network/onc/onc_constants.cc
@@ -95,7 +95,7 @@ namespace connection_state {
 const char kConnected[] = "Connected";
 const char kConnecting[] = "Connecting";
 const char kNotConnected[] = "NotConnected";
-}  // namespace status
+}  // namespace connection_state
 
 namespace ethernet {
 const char kAuthentication[] = "Authentication";
@@ -190,6 +190,7 @@ const char kPAP[] = "PAP";
 const char kPEAP[] = "PEAP";
 const char kPassword[] = "Password";
 const char kSaveCredentials[] = "SaveCredentials";
+const char kServerCAPEM[] = "ServerCAPEM";
 const char kServerCARef[] = "ServerCARef";
 const char kUseSystemCAs[] = "UseSystemCAs";
 }  // namespace eap
@@ -198,25 +199,19 @@ 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";
@@ -226,7 +221,7 @@ 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";
@@ -237,13 +232,26 @@ 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 {
+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 kServerCAPEM[] = "ServerCAPEM";
+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