chromeos/tpm_token_loader.cc - Issue 383593002: Add GetSystemNSSKeySlot, merge GetPrivateNSSKeySlot/GetPublicNSSKeySlot to GetPersistentNSSKeySlot.

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/tpm_token_loader.cc

Issue 383593002: Add GetSystemNSSKeySlot, merge GetPrivateNSSKeySlot/GetPublicNSSKeySlot to GetPersistentNSSKeySlot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: changes for comment #5 Created 6 years, 5 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

Index: chromeos/tpm_token_loader.cc

diff --git a/chromeos/tpm_token_loader.cc b/chromeos/tpm_token_loader.cc

index 3ea07fc6df2063b571640703f96f101da2c35c55..4b80632b639a5218bce10a309bb28f364d1b07be 100644

--- a/chromeos/tpm_token_loader.cc

+++ b/chromeos/tpm_token_loader.cc

@@ -195,7 +195,7 @@ void TPMTokenLoader::ContinueTokenInitialization() {

crypto_task_runner_->PostTask(

FROM_HERE,

base::Bind(

- &crypto::InitializeTPMToken,

+ &crypto::InitializeTPMTokenAndSystemSlot,

tpm_token_slot_id_,

base::Bind(&PostResultToTaskRunner,

base::MessageLoopProxy::current(),

« no previous file with comments | « chrome/browser/net/nss_context_linux.cc ('k') | crypto/nss_util.h » ('j') | no next file with comments »