Check configuration for L2TP/IPsec+certificate VPN network with UIData.

chromeos/network/client_cert_util.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/client_cert_util.h"
 
 #include <cert.h>
 #include <pk11pub.h>
 
 #include <list>
@@ skipping 241 matching lines @@
   const base::DictionaryValue* provider_properties = NULL;
   service_properties.GetDictionaryWithoutPathExpansion(
       shill::kProviderProperty, &provider_properties);
   switch (cert_config_type) {
     case CONFIG_TYPE_NONE:
       return true;
     case CONFIG_TYPE_OPENVPN:
       // OpenVPN generally requires a passphrase and we don't know whether or
       // not one is required, so always return false here.
       return false;
-    case CONFIG_TYPE_IPSEC:
-      // IPSec may require a passphrase, so return false here also.
-      return false;
+    case CONFIG_TYPE_IPSEC: {

[stevenjb, 2014/02/14 16:44:13]

nit: if (!provider_properties) return false;

+      std::string client_cert_id;
+      if (provider_properties) {
+        provider_properties->GetStringWithoutPathExpansion(
+            shill::kL2tpIpsecClientCertIdProperty, &client_cert_id);
+      }
+      return !client_cert_id.empty();
+    }
     case CONFIG_TYPE_EAP: {
       std::string cert_id = GetStringFromDictionary(
           service_properties, shill::kEapCertIdProperty);
       std::string key_id = GetStringFromDictionary(
           service_properties, shill::kEapKeyIdProperty);
       std::string identity = GetStringFromDictionary(
           service_properties, shill::kEapIdentityProperty);
       return !cert_id.empty() && !key_id.empty() && !identity.empty();
     }
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace client_cert
 
 }  // namespace chromeos