Fix WiFi config view for previously configured client cert.

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 200 matching lines @@
   // Iterate over the rest looking for the one that was issued latest.
   for (CertificateStlList::iterator iter = matching_certs.begin();
        iter != matching_certs.end(); ++iter) {
     if (!latest.get() || (*iter)->valid_start() > latest->valid_start())
       latest = *iter;
   }
 
   return latest;
 }
 
+std::string GetPkcs11IdFromEapCertId(const std::string& cert_id) {
+  if (cert_id.empty())
+    return std::string();
+
+  size_t delimiter_pos = cert_id.find(':');
+  if (delimiter_pos == std::string::npos) {
+    // No delimiter found, so |cert_id| only contains the PKCS11 id.
+    return cert_id;
+  }
+  if (delimiter_pos + 1 >= cert_id.size()) {
+    LOG(ERROR) << "Empty PKCS11 id in cert id.";
+    return std::string();
+  }
+  return cert_id.substr(delimiter_pos + 1);
+}
+
 void SetShillProperties(const ConfigType cert_config_type,
                         const std::string& tpm_slot,
                         const std::string& tpm_pin,
                         const std::string* pkcs11_id,
                         base::DictionaryValue* properties) {
   const char* tpm_pin_property = NULL;
   switch (cert_config_type) {
     case CONFIG_TYPE_NONE: {
       return;
     }
@@ skipping 138 matching lines @@
       return !cert_id.empty() && !key_id.empty() && !identity.empty();
     }
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace client_cert
 
 }  // namespace chromeos