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

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

Issue 61903002: ChromeOS: Add more host verification options for OpenVpn. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 4996ae2b42a0121300b1ed871d4dd0580ffa61d0..46f7cb669e5def5ea98a7f56a931b97454e22c88 100644
--- a/chromeos/network/onc/onc_signature.cc
+++ b/chromeos/network/onc/onc_signature.cc
@@ -126,8 +126,14 @@ const OncFieldSignature openvpn_fields[] = {
{ ::onc::vpn::kUsername, &kStringSignature},
// Not supported, yet.
{ ::onc::openvpn::kVerb, &kStringSignature},
+ { ::onc::openvpn::kVerifyHash, &kStringSignature},
+ { ::onc::openvpn::kVerifyX509, &kVerifyX509Signature},
{NULL}};
+const OncFieldSignature verify_x509_fields[] = {
+ { ::onc::verify_x509::kName, &kStringSignature},
+ { ::onc::verify_x509::kType, &kStringSignature}, {NULL}};
bartfab (slow) 2013/11/07 10:48:56 Nit: Add line break before {NULL}
pneubeck (no reviews) 2013/11/11 11:53:43 Done.
+
const OncFieldSignature vpn_fields[] = {
{ ::onc::kRecommended, &kRecommendedSignature},
{ ::onc::vpn::kAutoConnect, &kBoolSignature},
@@ -316,6 +322,9 @@ const OncValueSignature kL2TPSignature = {
const OncValueSignature kOpenVPNSignature = {
Value::TYPE_DICTIONARY, openvpn_fields, NULL
};
+const OncValueSignature kVerifyX509Signature = {
+ Value::TYPE_DICTIONARY, verify_x509_fields, NULL
+};
const OncValueSignature kVPNSignature = {
Value::TYPE_DICTIONARY, vpn_fields, NULL
};

Powered by Google App Engine
This is Rietveld 408576698