Resolve certificate references in ONC by PEM.

chromeos/network/onc/onc_translation_tables.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_translation_tables.h"
 
 #include <cstddef>
 
 #include "base/logging.h"
 #include "chromeos/network/onc/onc_constants.h"
@@ skipping 15 matching lines @@
 const FieldTranslationEntry eap_fields[] = {
   { eap::kAnonymousIdentity, flimflam::kEapAnonymousIdentityProperty },
   { eap::kIdentity, flimflam::kEapIdentityProperty },
   // This field is converted during translation, see onc_translator_*.
   // { eap::kInner, flimflam::kEapPhase2AuthProperty },
 
   // This field is converted during translation, see onc_translator_*.
   // { eap::kOuter, flimflam::kEapMethodProperty },
   { eap::kPassword, flimflam::kEapPasswordProperty },
   { eap::kSaveCredentials, flimflam::kSaveCredentialsProperty },
-  { eap::kServerCARef, flimflam::kEapCaCertNssProperty },
+  { eap::kServerCAPEMs, shill::kEapCaCertPemProperty },
   { eap::kUseSystemCAs, flimflam::kEapUseSystemCasProperty },
   { NULL }
 };
 
 const FieldTranslationEntry ipsec_fields[] = {
   // Ignored by Shill, not necessary to synchronize.
   // { ipsec::kAuthenticationType, flimflam::kL2tpIpsecAuthenticationType },
   { ipsec::kGroup, shill::kL2tpIpsecTunnelGroupProperty },
   // Ignored by Shill, not necessary to synchronize.
   // { ipsec::kIKEVersion, flimflam::kL2tpIpsecIkeVersion },
   { ipsec::kPSK, flimflam::kL2tpIpsecPskProperty },
   { vpn::kSaveCredentials, flimflam::kSaveCredentialsProperty },
-  { ipsec::kServerCARef, flimflam::kL2tpIpsecCaCertNssProperty },
+  { ipsec::kServerCAPEMs, shill::kL2tpIpsecCaCertPemProperty },
   { NULL }
 };
 
 const FieldTranslationEntry l2tp_fields[] = {
   { vpn::kPassword, flimflam::kL2tpIpsecPasswordProperty },
   // We don't synchronize l2tp's SaveCredentials field for now, as Shill doesn't
   // support separate settings for ipsec and l2tp.
   // { vpn::kSaveCredentials, &kBoolSignature },
   { vpn::kUsername, flimflam::kL2tpIpsecUserProperty },
   { NULL }
@@ skipping 11 matching lines @@
   { vpn::kPassword, flimflam::kOpenVPNPasswordProperty },
   { openvpn::kPort, flimflam::kOpenVPNPortProperty },
   { openvpn::kProto, flimflam::kOpenVPNProtoProperty },
   { openvpn::kPushPeerInfo, flimflam::kOpenVPNPushPeerInfoProperty },
   { openvpn::kRemoteCertEKU, flimflam::kOpenVPNRemoteCertEKUProperty },
   // This field is converted during translation, see onc_translator_*.
   // { openvpn::kRemoteCertKU, flimflam::kOpenVPNRemoteCertKUProperty },
   { openvpn::kRemoteCertTLS, flimflam::kOpenVPNRemoteCertTLSProperty },
   { openvpn::kRenegSec, flimflam::kOpenVPNRenegSecProperty },
   { vpn::kSaveCredentials, flimflam::kSaveCredentialsProperty },
-  { openvpn::kServerCARef, flimflam::kOpenVPNCaCertNSSProperty },
+  { openvpn::kServerCAPEMs, shill::kOpenVPNCaCertPemProperty },
   { openvpn::kServerPollTimeout, flimflam::kOpenVPNServerPollTimeoutProperty },
   { openvpn::kShaper, flimflam::kOpenVPNShaperProperty },
   { openvpn::kStaticChallenge, flimflam::kOpenVPNStaticChallengeProperty },
   { openvpn::kTLSAuthContents, flimflam::kOpenVPNTLSAuthContentsProperty },
   { openvpn::kTLSRemote, flimflam::kOpenVPNTLSRemoteProperty },
   { vpn::kUsername, flimflam::kOpenVPNUserProperty },
   { NULL }
 };
 
 const FieldTranslationEntry vpn_fields[] = {
@@ skipping 178 matching lines @@
       continue;
     *onc_value = table[i].onc_value;
     return true;
   }
   LOG(ERROR) << "Value '" << shill_value << "' cannot be translated to ONC";
   return false;
 }
 
 }  // namespace onc
 }  // namespace chromeos