ChromeOS: Add more host verification options for OpenVpn.

chromeos/network/onc/onc_signature.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/onc/onc_signature.h"
 
 #include "components/onc/onc_constants.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using base::Value;
@@ skipping 108 matching lines @@
     { ::onc::openvpn::kServerCertPEM, &kStringSignature},
     { ::onc::openvpn::kServerCertRef, &kStringSignature},
     { ::onc::openvpn::kServerPollTimeout, &kIntegerSignature},
     { ::onc::openvpn::kShaper, &kIntegerSignature},
     { ::onc::openvpn::kStaticChallenge, &kStringSignature},
     { ::onc::openvpn::kTLSAuthContents, &kStringSignature},
     { ::onc::openvpn::kTLSRemote, &kStringSignature},
     { ::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},
     { ::onc::vpn::kHost, &kStringSignature},
     { ::onc::vpn::kIPsec, &kIPsecSignature},
     { ::onc::vpn::kL2TP, &kL2TPSignature},
     { ::onc::vpn::kOpenVPN, &kOpenVPNSignature},
     { ::onc::vpn::kType, &kStringSignature},
     {NULL}};
 
@@ skipping 168 matching lines @@
 };
 const OncValueSignature kIPsecSignature = {
   Value::TYPE_DICTIONARY, ipsec_fields, NULL
 };
 const OncValueSignature kL2TPSignature = {
   Value::TYPE_DICTIONARY, l2tp_fields, NULL
 };
 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
 };
 const OncValueSignature kEthernetSignature = {
   Value::TYPE_DICTIONARY, ethernet_fields, NULL
 };
 const OncValueSignature kIPConfigSignature = {
   Value::TYPE_DICTIONARY, ipconfig_fields, NULL
 };
 const OncValueSignature kProxyLocationSignature = {
@@ skipping 88 matching lines @@
     if (&signature == entry->value_signature &&
         onc_field_name == entry->field_name) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace onc
 }  // namespace chromeos