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

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.h

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

index 22063707cd9b57d80b99f5da39b34d98f0c21197..137197d3b9be9b990ed293c028a01501b90d9367 100644

--- a/chrome/browser/certificate_manager_model.h

+++ b/chrome/browser/certificate_manager_model.h

@@ -57,7 +57,8 @@ class CertificateManagerModel {

// Import certificates from PKCS #12 encoded |data|, using the given

// |password|. Returns a net error code on failure.

- int ImportFromPKCS12(const std::string& data, const string16& password);

+ int ImportFromPKCS12(net::CryptoModule* module, const std::string& data,

+ const string16& password);

// Import CA certificates.

// Tries to import all the certificates given. The root will be trusted

« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/certificate_manager_model.cc » ('j') | no next file with comments »