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

Unified Diff: chromeos/network/onc/onc_signature.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_constants.cc ('k') | chromeos/network/onc/onc_test_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/onc/onc_signature.cc
diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc
index fbf2e0da86ff7b5ca5605a08b1a0939a0a756ec3..d4c0bd121fae12dbc8200f17360271ff218edc5f 100644
--- a/chromeos/network/onc/onc_signature.cc
+++ b/chromeos/network/onc/onc_signature.cc
@@ -45,6 +45,7 @@ const OncFieldSignature certificate_pattern_fields[] = {
{ certificate::kEnrollmentURI, &kStringListSignature },
{ certificate::kIssuer, &kIssuerSubjectPatternSignature },
{ certificate::kIssuerCARef, &kStringListSignature },
+ { certificate::kIssuerCAPEMs, &kStringListSignature },
{ certificate::kSubject, &kIssuerSubjectPatternSignature },
{ NULL }
};
@@ -60,6 +61,7 @@ const OncFieldSignature eap_fields[] = {
{ eap::kOuter, &kStringSignature },
{ eap::kPassword, &kStringSignature },
{ eap::kSaveCredentials, &kBoolSignature },
+ { eap::kServerCAPEMs, &kStringListSignature },
{ eap::kServerCARef, &kStringSignature },
{ eap::kUseSystemCAs, &kBoolSignature },
{ NULL }
@@ -75,6 +77,7 @@ const OncFieldSignature ipsec_fields[] = {
{ ipsec::kIKEVersion, &kIntegerSignature },
{ ipsec::kPSK, &kStringSignature },
{ vpn::kSaveCredentials, &kBoolSignature },
+ { ipsec::kServerCAPEMs, &kStringSignature },
{ ipsec::kServerCARef, &kStringSignature },
// Not yet supported.
// { ipsec::kEAP, &kEAPSignature },
@@ -112,8 +115,10 @@ const OncFieldSignature openvpn_fields[] = {
{ openvpn::kRemoteCertTLS, &kStringSignature },
{ openvpn::kRenegSec, &kIntegerSignature },
{ vpn::kSaveCredentials, &kBoolSignature },
+ { openvpn::kServerCAPEMs, &kStringListSignature },
{ openvpn::kServerCARef, &kStringSignature },
// Not supported, yet.
+ { openvpn::kServerCertPEM, &kStringSignature },
{ openvpn::kServerCertRef, &kStringSignature },
{ openvpn::kServerPollTimeout, &kIntegerSignature },
{ openvpn::kShaper, &kIntegerSignature },
« no previous file with comments | « chromeos/network/onc/onc_constants.cc ('k') | chromeos/network/onc/onc_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698