chromeos/network/client_cert_resolver.cc - Issue 135193007: Use user specific NSSDatabase in CertLoader.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/network/client_cert_resolver.cc

Issue 135193007: Use user specific NSSDatabase in CertLoader. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 11 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:

Index: chromeos/network/client_cert_resolver.cc

diff --git a/chromeos/network/client_cert_resolver.cc b/chromeos/network/client_cert_resolver.cc

index 018609f93898995c925d1d56d3d6637b904acf19..52c6612a707de7de803f0c261bea68728183e75d 100644

--- a/chromeos/network/client_cert_resolver.cc

+++ b/chromeos/network/client_cert_resolver.cc

@@ -27,6 +27,7 @@

#include "chromeos/network/managed_network_configuration_handler.h"

#include "chromeos/network/network_state_handler.h"

#include "chromeos/network/network_ui_data.h"

+#include "chromeos/tpm_token_loader.h"

#include "components/onc/onc_constants.h"

#include "dbus/object_path.h"

#include "net/cert/x509_certificate.h"

@@ -436,8 +437,8 @@ void ClientCertResolver::ConfigureCertificates(NetworkCertMatches* matches) {

base::DictionaryValue shill_properties;

client_cert::SetShillProperties(

it->cert_config_type,

- base::IntToString(cert_loader->tpm_token_slot_id()),

- cert_loader->tpm_user_pin(),

+ base::IntToString(cert_loader->TPMTokenSlotID()),

+ TPMTokenLoader::Get()->tpm_user_pin(),

&it->pkcs11_id,

&shill_properties);

DBusThreadManager::Get()->GetShillServiceClient()->

« no previous file with comments | « chromeos/chromeos.gyp ('k') | chromeos/network/client_cert_resolver_unittest.cc » ('j') | no next file with comments »