chrome/browser/ui/webui/settings/certificates_handler.cc - 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: chrome/browser/ui/webui/settings/certificates_handler.cc

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: chrome/browser/ui/webui/settings/certificates_handler.cc

diff --git a/chrome/browser/ui/webui/settings/certificates_handler.cc b/chrome/browser/ui/webui/settings/certificates_handler.cc

index 16503d8298843d7fd420681c32bccee5eea0b62f..cee659145482ff8a07acd47f4a80018e9cc13c48 100644

--- a/chrome/browser/ui/webui/settings/certificates_handler.cc

+++ b/chrome/browser/ui/webui/settings/certificates_handler.cc

@@ -740,7 +740,7 @@ void CertificatesHandler::ImportPersonalSlotUnlocked() {

// for Chrome OS when the "Import and Bind" option is chosen.

bool is_extractable = !use_hardware_backed_;

int result = certificate_manager_model_->ImportFromPKCS12(

- module_.get(), file_data_, password_, is_extractable);

+ module_->os_module_handle(), file_data_, password_, is_extractable);

ImportExportCleanup();

int string_id;

switch (result) {