Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(486)

Unified Diff: chromeos/network/onc/onc_translation_tables.cc

Issue 16946002: Resolve certificate references in ONC by PEM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added a unit test for the resolve function. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/network/onc/onc_test_utils.cc ('k') | chromeos/network/onc/onc_translator_onc_to_shill.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/onc/onc_translation_tables.cc
diff --git a/chromeos/network/onc/onc_translation_tables.cc b/chromeos/network/onc/onc_translation_tables.cc
index dea652d853861b86988e7d7fdc0a70664323e0cd..d010752d273975c3fc3046628605f5cec61cd9af 100644
--- a/chromeos/network/onc/onc_translation_tables.cc
+++ b/chromeos/network/onc/onc_translation_tables.cc
@@ -33,7 +33,7 @@ const FieldTranslationEntry eap_fields[] = {
// { 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 }
};
@@ -46,7 +46,7 @@ const FieldTranslationEntry ipsec_fields[] = {
// { ipsec::kIKEVersion, flimflam::kL2tpIpsecIkeVersion },
{ ipsec::kPSK, flimflam::kL2tpIpsecPskProperty },
{ vpn::kSaveCredentials, flimflam::kSaveCredentialsProperty },
- { ipsec::kServerCARef, flimflam::kL2tpIpsecCaCertNssProperty },
+ { ipsec::kServerCAPEMs, shill::kL2tpIpsecCaCertPemProperty },
{ NULL }
};
@@ -78,7 +78,7 @@ const FieldTranslationEntry openvpn_fields[] = {
{ 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 },
« no previous file with comments | « chromeos/network/onc/onc_test_utils.cc ('k') | chromeos/network/onc/onc_translator_onc_to_shill.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698