Use correct slot id for client certs in network config.

chromeos/network/client_cert_util.h

 // 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.
 
 #ifndef CHROMEOS_NETWORK_CLIENT_CERT_UTIL_H_
 #define CHROMEOS_NETWORK_CLIENT_CERT_UTIL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/network/certificate_pattern.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace net {
 struct CertPrincipal;
 class X509Certificate;
 typedef std::vector<scoped_refptr<X509Certificate> > CertificateList;
 }
 
 namespace chromeos {
 
-class IssuerSubjectPattern;
-
 namespace client_cert {
 
 enum ConfigType {
   CONFIG_TYPE_NONE,
   CONFIG_TYPE_OPENVPN,
   CONFIG_TYPE_IPSEC,
   CONFIG_TYPE_EAP
 };
 
 struct CHROMEOS_EXPORT ClientCertConfig {
@@ skipping 11 matching lines @@
   CertificatePattern pattern;
 };
 
 // Returns true only if any fields set in this pattern match exactly with
 // similar fields in the principal.  If organization_ or organizational_unit_
 // are set, then at least one of the organizations or units in the principal
 // must match.
 bool CertPrincipalMatches(const IssuerSubjectPattern& pattern,
                           const net::CertPrincipal& principal);
 
-// Fetches the matching certificate that has the latest valid start date.
-// Returns a NULL refptr if there is no such match.
-CHROMEOS_EXPORT scoped_refptr<net::X509Certificate> GetCertificateMatch(
-    const CertificatePattern& pattern,
-    const net::CertificateList& all_certs);
-
 // Returns the PKCS11 id part of |cert_id|, which is expected to be the value of
 // the Shill property kEapCertIdProperty or kEapKeyIdProperty.
 CHROMEOS_EXPORT std::string GetPkcs11IdFromEapCertId(
     const std::string& cert_id);
 
-// If not empty, sets the TPM properties in |properties|. If |pkcs11_id| is not
-// NULL, also sets the ClientCertID. |cert_config_type| determines which
-// dictionary entries to set.
+// Sets the properties of a client cert and the TPM slot that it's contained in.
+// |cert_config_type| determines which dictionary entries to set.
 CHROMEOS_EXPORT void SetShillProperties(const ConfigType cert_config_type,
-                                        const std::string& tpm_slot,
-                                        const std::string& tpm_pin,
-                                        const std::string* pkcs11_id,
+                                        const int tpm_slot,
+                                        const std::string& pkcs11_id,
                                         base::DictionaryValue* properties);
 
+// Like SetShillProperties but instead sets the properties to empty strings.
+// This should be used to clear previously set client certificate properties.
+CHROMEOS_EXPORT void SetEmptyShillProperties(const ConfigType cert_config_type,
+                                             base::DictionaryValue* properties);
+
 // Returns true if all required configuration properties are set and not empty.
 bool IsCertificateConfigured(const client_cert::ConfigType cert_config_type,
                              const base::DictionaryValue& service_properties);
 
 // Determines the type of the CertificatePattern configuration, i.e. is it a
 // pattern within an EAP, IPsec or OpenVPN configuration.
 CHROMEOS_EXPORT void OncToClientCertConfig(
     const base::DictionaryValue& network_config,
     ClientCertConfig* cert_config);
 
 }  // namespace client_cert
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_CLIENT_CERT_UTIL_H_