Pass slot id to Shill for manually configured WiFi with EAP-TLS.

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"
@@ skipping 838 matching lines @@
       shill::kEapIdentityProperty, GetEapIdentity());
   properties->SetStringWithoutPathExpansion(
       shill::kEapMethodProperty, GetEapMethod());
   properties->SetStringWithoutPathExpansion(
       shill::kEapPhase2AuthProperty, GetEapPhase2Auth());
   properties->SetStringWithoutPathExpansion(
       shill::kEapAnonymousIdentityProperty, GetEapAnonymousIdentity());
   properties->SetStringWithoutPathExpansion(
       shill::kEapSubjectMatchProperty, GetEapSubjectMatch());
 
-  // shill requires both CertID and KeyID for TLS connections, despite
-  // the fact that by convention they are the same ID.
-  properties->SetStringWithoutPathExpansion(
-      shill::kEapCertIdProperty, GetEapClientCertPkcs11Id());
-  properties->SetStringWithoutPathExpansion(
-      shill::kEapKeyIdProperty, GetEapClientCertPkcs11Id());
+  const std::string pkcs11id = GetEapClientCertPkcs11Id();
+  client_cert::SetShillProperties(client_cert::CONFIG_TYPE_EAP,
+                                  CertLibrary::Get()->GetTPMSlotID(),
+                                  TPMTokenLoader::Get()->tpm_user_pin(),
+                                  &pkcs11id,
+                                  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 483 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