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_translation_tables.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_translation_tables.cc
diff --git a/chromeos/network/onc/onc_translation_tables.cc b/chromeos/network/onc/onc_translation_tables.cc
index a0bebbee1a3d8059e14eef8c8fa8ca668ee8cfbb..ae57b3e5151ad1bedf9c5329c45f86a41ce19350 100644
--- a/chromeos/network/onc/onc_translation_tables.cc
+++ b/chromeos/network/onc/onc_translation_tables.cc
@@ -83,7 +83,14 @@ const FieldTranslationEntry openvpn_fields[] = {
{ ::onc::openvpn::kStaticChallenge, shill::kOpenVPNStaticChallengeProperty},
{ ::onc::openvpn::kTLSAuthContents, shill::kOpenVPNTLSAuthContentsProperty},
{ ::onc::openvpn::kTLSRemote, shill::kOpenVPNTLSRemoteProperty},
- { ::onc::vpn::kUsername, shill::kOpenVPNUserProperty}, {NULL}};
+ { ::onc::vpn::kUsername, shill::kOpenVPNUserProperty},
+ { ::onc::openvpn::kVerifyHash, shill::kOpenVPNVerifyHashProperty},
+ {NULL}};
+
+const FieldTranslationEntry verify_x509_fields[] = {
+ { ::onc::verify_x509::kName, shill::kOpenVPNVerifyX509NameProperty},
+ { ::onc::verify_x509::kType, shill::kOpenVPNVerifyX509TypeProperty},
+ {NULL}};
const FieldTranslationEntry vpn_fields[] = {
{ ::onc::vpn::kAutoConnect, shill::kAutoConnectProperty},
@@ -173,6 +180,7 @@ const OncValueTranslationEntry onc_value_translation_table[] = {
{ &kIPsecSignature, ipsec_fields },
{ &kL2TPSignature, l2tp_fields },
{ &kOpenVPNSignature, openvpn_fields },
+ { &kVerifyX509Signature, verify_x509_fields },
{ &kVPNSignature, vpn_fields },
{ &kWiFiSignature, wifi_fields },
{ &kWiFiWithStateSignature, wifi_fields },

Powered by Google App Engine
This is Rietveld 408576698