Use correct slot id for client certs in network config.

chrome/browser/chromeos/options/wifi_config_view.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 "chrome/browser/chromeos/options/wifi_config_view.h"
 
 #include "ash/system/chromeos/network/network_connect.h"
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
 #include "chrome/browser/chromeos/net/onc_utils.h"
 #include "chrome/browser/chromeos/options/passphrase_textfield.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/client_cert_util.h"
 #include "chromeos/network/network_configuration_handler.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_ui_data.h"
 #include "chromeos/network/shill_property_util.h"
-#include "chromeos/tpm_token_loader.h"
 #include "components/onc/onc_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/views/controls/button/checkbox.h"
@@ skipping 692 matching lines @@
             shill::kPassphraseProperty, passphrase);
       }
     }
     if (network->type() == shill::kTypeEthernet) {
       // When configuring an ethernet service, we actually configure the
       // EthernetEap service, which exists in the Profile only.
       // See crbug.com/126870 for more info.
       properties.SetStringWithoutPathExpansion(shill::kTypeProperty,
                                                shill::kTypeEthernetEap);
       share_network = false;
-      // Set the TPM PIN.
-      properties.SetStringWithoutPathExpansion(
-          shill::kEapPinProperty, TPMTokenLoader::Get()->tpm_user_pin());
       ash::network_connect::CreateConfiguration(&properties, share_network);
     } else {
       ash::network_connect::ConfigureNetworkAndConnect(
           service_path_, properties, share_network);
     }
   }
   return true;  // dialog will be closed
 }
 
 std::string WifiConfigView::GetSsid() const {
@@ skipping 82 matching lines @@
   DCHECK(server_ca_cert_combobox_);
   // Only use system CAs if the first item ("Default") is selected.
   return server_ca_cert_combobox_->selected_index() == 0;
 }
 
 std::string WifiConfigView::GetEapSubjectMatch() const {
   DCHECK(subject_match_textfield_);
   return base::UTF16ToUTF8(subject_match_textfield_->text());
 }
 
-std::string WifiConfigView::GetEapClientCertPkcs11Id() const {
+void WifiConfigView::SetEapClientCertProperties(
+    base::DictionaryValue* properties) const {
   DCHECK(user_cert_combobox_);
   if (!HaveUserCerts() || !UserCertActive()) {
-    return std::string();  // No certificate selected or not required.
+    // No certificate selected or not required.
+    client_cert::SetEmptyShillProperties(client_cert::CONFIG_TYPE_EAP,
+                                         properties);
   } else {
     // Certificates are listed in the order they appear in the model.
     int index = user_cert_combobox_->selected_index();
-    return CertLibrary::Get()->GetUserCertPkcs11IdAt(index);
+    int slot_id = -1;
+    const std::string pkcs11_id =
+        CertLibrary::Get()->GetUserCertPkcs11IdAt(index, &slot_id);
+    client_cert::SetShillProperties(
+        client_cert::CONFIG_TYPE_EAP, slot_id, pkcs11_id, properties);
   }
 }
 
 std::string WifiConfigView::GetEapIdentity() const {
   DCHECK(identity_textfield_);
   return base::UTF16ToUTF8(identity_textfield_->text());
 }
 
 std::string WifiConfigView::GetEapAnonymousIdentity() const {
   DCHECK(identity_anonymous_textfield_);
   return base::UTF16ToUTF8(identity_anonymous_textfield_->text());
 }
 
 void WifiConfigView::SetEapProperties(base::DictionaryValue* properties) {
   properties->SetStringWithoutPathExpansion(
       shill::kEapIdentityProperty, GetEapIdentity());
   properties->SetStringWithoutPathExpansion(
       shill::kEapMethodProperty, GetEapMethod());
   properties->SetStringWithoutPathExpansion(
       shill::kEapPhase2AuthProperty, GetEapPhase2Auth());
   properties->SetStringWithoutPathExpansion(
       shill::kEapAnonymousIdentityProperty, GetEapAnonymousIdentity());
   properties->SetStringWithoutPathExpansion(
       shill::kEapSubjectMatchProperty, GetEapSubjectMatch());
 
-  const std::string pkcs11id = GetEapClientCertPkcs11Id();
-  client_cert::SetShillProperties(client_cert::CONFIG_TYPE_EAP,
-                                  CertLibrary::Get()->GetTPMSlotID(),
-                                  TPMTokenLoader::Get()->tpm_user_pin(),
-                                  &pkcs11id,
-                                  properties);
+  SetEapClientCertProperties(properties);
 
   properties->SetBooleanWithoutPathExpansion(
       shill::kEapUseSystemCasProperty, GetEapUseSystemCas());
   properties->SetStringWithoutPathExpansion(
       shill::kEapPasswordProperty, GetPassphrase());
 
   base::ListValue* pem_list = new base::ListValue;
   pem_list->AppendString(GetEapServerCaCertPEM());
   properties->SetWithoutPathExpansion(
       shill::kEapCaCertPemProperty, pem_list);
@@ skipping 484 matching lines @@
 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data,
                                         const NetworkState* network,
                                         const std::string& key) {
   std::string onc_tag = network->type() == shill::kTypeEthernet
                             ? ::onc::ethernet::kEAP
                             : ::onc::wifi::kEAP;
   ParseUIProperty(property_ui_data, network, onc_tag + '.' + key);
 }
 
 }  // namespace chromeos