chromeos/network/onc/onc_translation_tables.cc - Issue 16946002: Resolve certificate references in ONC by PEM.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Support CACert PEM list for L2tp. 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

« chromeos/network/onc/onc_constants.cc ('K') | « chromeos/network/onc/onc_signature.cc ('k') | chromeos/network/onc/onc_translator_onc_to_shill.cc » ('j') | chromeos/test/data/network/managed_toplevel1_with_cert_pems.onc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 c08bab015d39ff2d3fe682aee6b8d56f4e43ab84..40e771d660ae603cdd262c394616a5e1476134db 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 }

};

@@ -41,12 +41,12 @@ const FieldTranslationEntry eap_fields[] = {

const FieldTranslationEntry ipsec_fields[] = {

// Ignored by Shill, not necessary to synchronize.

// { vpn::kAuthenticationType, flimflam::kL2tpIpsecAuthenticationType },

- { vpn::kGroup, shill::kL2tpIpsecTunnelGroupProperty },

+ { ipsec::kGroup, shill::kL2tpIpsecTunnelGroupProperty },

// Ignored by Shill, not necessary to synchronize.

// { vpn::kIKEVersion, flimflam::kL2tpIpsecIkeVersion },

- { vpn::kPSK, flimflam::kL2tpIpsecPskProperty },

+ { ipsec::kPSK, flimflam::kL2tpIpsecPskProperty },

{ vpn::kSaveCredentials, flimflam::kSaveCredentialsProperty },

- { vpn::kServerCARef, flimflam::kL2tpIpsecCaCertNssProperty },

+ { ipsec::kServerCAPEMs, shill::kL2tpIpsecCaCertPemProperty },

{ NULL }

};

@@ -78,7 +78,7 @@ const FieldTranslationEntry openvpn_fields[] = {

{ vpn::kRemoteCertTLS, flimflam::kOpenVPNRemoteCertTLSProperty },

{ vpn::kRenegSec, flimflam::kOpenVPNRenegSecProperty },

{ vpn::kSaveCredentials, flimflam::kSaveCredentialsProperty },

- { vpn::kServerCARef, flimflam::kOpenVPNCaCertNSSProperty },

+ { openvpn::kServerCAPEMs, shill::kOpenVPNCaCertPemProperty },

{ vpn::kServerPollTimeout, flimflam::kOpenVPNServerPollTimeoutProperty },

{ vpn::kShaper, flimflam::kOpenVPNShaperProperty },

{ vpn::kStaticChallenge, flimflam::kOpenVPNStaticChallengeProperty },