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

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: Fixed tests. 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
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 e194b48b22856fd7dda4947fcd9c7f5d367d21e8..379dd40b88cb7a3c4ea538481ea49fa64c85fbee 100644
--- a/chromeos/network/onc/onc_translation_tables.cc
+++ b/chromeos/network/onc/onc_translation_tables.cc
@@ -33,7 +33,8 @@ const FieldTranslationEntry eap_fields[] = {
// { eap::kOuter, flimflam::kEapMethodProperty },
{ eap::kPassword, flimflam::kEapPasswordProperty },
{ eap::kSaveCredentials, flimflam::kSaveCredentialsProperty },
- { eap::kServerCARef, flimflam::kEapCaCertNssProperty },
+ // This field is converted during translation, see onc_translator_*.
+ // { eap::kServerCAFingerprint, shill::kEapCaCertPemProperty },
{ eap::kUseSystemCAs, flimflam::kEapUseSystemCasProperty },
{ NULL }
};
@@ -46,7 +47,8 @@ const FieldTranslationEntry ipsec_fields[] = {
// { vpn::kIKEVersion, flimflam::kL2tpIpsecIkeVersion },
{ vpn::kPSK, flimflam::kL2tpIpsecPskProperty },
{ vpn::kSaveCredentials, flimflam::kSaveCredentialsProperty },
- { vpn::kServerCARef, flimflam::kL2tpIpsecCaCertNssProperty },
+ // This field is converted during translation, see onc_translator_*.
+ // { vpn::kServerCAFingerprint, shill::kL2tpIpsecCaCertPemProperty },
{ NULL }
};
@@ -78,7 +80,8 @@ const FieldTranslationEntry openvpn_fields[] = {
{ vpn::kRemoteCertTLS, flimflam::kOpenVPNRemoteCertTLSProperty },
{ vpn::kRenegSec, flimflam::kOpenVPNRenegSecProperty },
{ vpn::kSaveCredentials, flimflam::kSaveCredentialsProperty },
- { vpn::kServerCARef, flimflam::kOpenVPNCaCertNSSProperty },
+ // This field is converted during translation, see onc_translator_*.
+ // { vpn::kServerCAFingerprint, shill::kOpenVPNCaCertPemProperty },
{ vpn::kServerPollTimeout, flimflam::kOpenVPNServerPollTimeoutProperty },
{ vpn::kShaper, flimflam::kOpenVPNShaperProperty },
{ vpn::kStaticChallenge, flimflam::kOpenVPNStaticChallengeProperty },

Powered by Google App Engine
This is Rietveld 408576698