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

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: 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_signature.cc
diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc
index aee54bb58854358d8da04700bb7713d5a45c23e8..3cc5a88b1c5dcc43254028d33ed27909caa54001 100644
--- a/chromeos/network/onc/onc_signature.cc
+++ b/chromeos/network/onc/onc_signature.cc
@@ -57,6 +57,7 @@ const OncFieldSignature eap_fields[] = {
{ eap::kOuter, &kStringSignature },
{ eap::kPassword, &kStringSignature },
{ eap::kSaveCredentials, &kBoolSignature },
+ { eap::kServerCAFingerprint, &kStringSignature },
{ eap::kServerCARef, &kStringSignature },
{ eap::kUseSystemCAs, &kBoolSignature },
{ NULL }
@@ -72,6 +73,7 @@ const OncFieldSignature ipsec_fields[] = {
{ vpn::kIKEVersion, &kIntegerSignature },
{ vpn::kPSK, &kStringSignature },
{ vpn::kSaveCredentials, &kBoolSignature },
+ { vpn::kServerCAFingerprint, &kStringSignature },
{ vpn::kServerCARef, &kStringSignature },
// Not yet supported.
// { vpn::kEAP, &kEAPSignature },
@@ -109,8 +111,10 @@ const OncFieldSignature openvpn_fields[] = {
{ vpn::kRemoteCertTLS, &kStringSignature },
{ vpn::kRenegSec, &kIntegerSignature },
{ vpn::kSaveCredentials, &kBoolSignature },
+ { vpn::kServerCAFingerprint, &kStringSignature },
{ vpn::kServerCARef, &kStringSignature },
// Not supported, yet.
+ { vpn::kServerCertFingerprint, &kStringSignature },
{ vpn::kServerCertRef, &kStringSignature },
{ vpn::kServerPollTimeout, &kIntegerSignature },
{ vpn::kShaper, &kIntegerSignature },

Powered by Google App Engine
This is Rietveld 408576698