Resolve certificate references in ONC by PEM.

chromeos/network/onc/onc_signature.cc

Index: chromeos/network/onc/onc_signature.cc
diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc
index aee54bb58854358d8da04700bb7713d5a45c23e8..5a1b9e4f7ce69f53c53bb7b05f047a418fa9b58e 100644
--- a/chromeos/network/onc/onc_signature.cc
+++ b/chromeos/network/onc/onc_signature.cc
@@ -57,6 +57,7 @@ const OncFieldSignature eap_fields[] = {
   { eap::kOuter, &kStringSignature },
   { eap::kPassword, &kStringSignature },
   { eap::kSaveCredentials, &kBoolSignature },
+  { eap::kServerCAPEM, &kStringSignature },
   { eap::kServerCARef, &kStringSignature },
   { eap::kUseSystemCAs, &kBoolSignature },
   { NULL }
@@ -64,18 +65,19 @@ const OncFieldSignature eap_fields[] = {
 
 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::kServerCAPEM, &kStringSignature },
+  { ipsec::kServerCARef, &kStringSignature },
   // Not yet supported.
-  //  { vpn::kEAP, &kEAPSignature },
-  //  { vpn::kXAUTH, &kXAUTHSignature },
+  //  { ipsec::kEAP, &kEAPSignature },
+  //  { ipsec::kXAUTH, &kXAUTHSignature },
   { NULL }
 };
 
@@ -109,8 +111,10 @@ const OncFieldSignature openvpn_fields[] = {
   { 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 },
@@ -376,7 +380,7 @@ struct CredentialEntry {
 
 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 },