net/cert/nss_cert_database.h - Issue 2600053002: net: change ImportFromPKCS12() to take a PK11SlotInfo*

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: net/cert/nss_cert_database.h

Issue 2600053002: net: change ImportFromPKCS12() to take a PK11SlotInfo* (Closed)

Patch Set: REBASE Created 3 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: net/cert/nss_cert_database.h

diff --git a/net/cert/nss_cert_database.h b/net/cert/nss_cert_database.h

index 2ee859dbb71603bd2d36b94d41ed6eaf88212c53..b168f8f19299e73381cc8c185a01aabe6c2cda1d 100644

--- a/net/cert/nss_cert_database.h

+++ b/net/cert/nss_cert_database.h

@@ -168,7 +168,7 @@ class NET_EXPORT NSSCertDatabase {

// Returns OK or a network error code such as ERR_PKCS12_IMPORT_BAD_PASSWORD

// or ERR_PKCS12_IMPORT_ERROR. |imported_certs|, if non-NULL, returns a list

// of certs that were imported.

- int ImportFromPKCS12(CryptoModule* module,

+ int ImportFromPKCS12(PK11SlotInfo* slot_info,

const std::string& data,

const base::string16& password,

bool is_extractable,

« no previous file with comments | « chromeos/network/onc/onc_certificate_importer_impl.cc ('k') | net/cert/nss_cert_database.cc » ('j') | no next file with comments »