chrome/browser/certificate_manager_model.cc - Issue 5686002: NSS: PKCS 11 password prompt.

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: chrome/browser/certificate_manager_model.cc

Issue 5686002: NSS: PKCS 11 password prompt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: addressing review comments Created 9 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: chrome/browser/certificate_manager_model.cc

diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc

index 619260ecb4df581a417df86b408d3d307610dbbc..067a3021e76a102ce797dc065ef7dd0068264396 100644

--- a/chrome/browser/certificate_manager_model.cc

+++ b/chrome/browser/certificate_manager_model.cc

@@ -74,9 +74,10 @@ string16 CertificateManagerModel::GetColumnText(

return rv;

}

-int CertificateManagerModel::ImportFromPKCS12(const std::string& data,

+int CertificateManagerModel::ImportFromPKCS12(net::CryptoModule* module,

+ const std::string& data,

const string16& password) {

- int result = cert_db_.ImportFromPKCS12(data, password);

+ int result = cert_db_.ImportFromPKCS12(module, data, password);

if (result == net::OK)

Refresh();

return result;