Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Unified Diff: chromeos/network/network_connection_handler.cc

Issue 36593002: crypto/nss_util: Get TPM slot id, do lookup by id instead of by name. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rename tpm_token_slot to tpm_token_slot_id, change InitializeTPMToken arg order Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/network/client_cert_resolver.cc ('k') | crypto/nss_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_connection_handler.cc
diff --git a/chromeos/network/network_connection_handler.cc b/chromeos/network/network_connection_handler.cc
index 1418bfa6af45695aa8376cf75ca28bcbfc533569..9649f51f09d6e30aede53e2d1dd01977e318d993 100644
--- a/chromeos/network/network_connection_handler.cc
+++ b/chromeos/network/network_connection_handler.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/json/json_reader.h"
+#include "base/strings/string_number_conversions.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/shill_manager_client.h"
@@ -441,11 +442,12 @@ void NetworkConnectionHandler::VerifyConfiguredAndConnect(
if (cert_loader_ && cert_loader_->IsHardwareBacked()) {
// Pass NULL if pkcs11_id is empty, so that it doesn't clear any
// previously configured client cert.
- client_cert::SetShillProperties(client_cert_type,
- cert_loader_->tpm_token_slot(),
- cert_loader_->tpm_user_pin(),
- pkcs11_id.empty() ? NULL : &pkcs11_id,
- &config_properties);
+ client_cert::SetShillProperties(
+ client_cert_type,
+ base::IntToString(cert_loader_->tpm_token_slot_id()),
+ cert_loader_->tpm_user_pin(),
+ pkcs11_id.empty() ? NULL : &pkcs11_id,
+ &config_properties);
}
}
« no previous file with comments | « chromeos/network/client_cert_resolver.cc ('k') | crypto/nss_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698