Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

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: Created 10 years 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: chrome/browser/certificate_manager_model.cc
diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc
index 1c7cd4e6b962ddd30f129f10c8e21eeeb7d9f2e0..b6b9bdfadd296e85caf9d74281964185730f2e05 100644
--- a/chrome/browser/certificate_manager_model.cc
+++ b/chrome/browser/certificate_manager_model.cc
@@ -76,9 +76,10 @@ string16 CertificateManagerModel::GetColumnText(
return rv;
}
-int CertificateManagerModel::ImportFromPKCS12(const std::string& data,
+int CertificateManagerModel::ImportFromPKCS12(net::PK11Slot* slot,
+ const std::string& data,
const string16& password) {
- int result = cert_db_.ImportFromPKCS12(data, password);
+ int result = cert_db_.ImportFromPKCS12(slot, data, password);
if (result == net::OK)
Refresh();
return result;

Powered by Google App Engine
This is Rietveld 408576698