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

Unified Diff: chromeos/network/onc/onc_certificate_importer_impl.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/settings/certificates_handler.cc ('k') | net/cert/nss_cert_database.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/onc/onc_certificate_importer_impl.cc
diff --git a/chromeos/network/onc/onc_certificate_importer_impl.cc b/chromeos/network/onc/onc_certificate_importer_impl.cc
index 7ab59a01aef12810b0573ad06ea4982d74ce58a6..1f04a6963af63ae404a41ec6fb7e03d1435ce347 100644
--- a/chromeos/network/onc/onc_certificate_importer_impl.cc
+++ b/chromeos/network/onc/onc_certificate_importer_impl.cc
@@ -286,12 +286,12 @@ bool CertificateImporterImpl::ParseClientCertificate(
crypto::ScopedPK11Slot private_slot(nssdb->GetPrivateSlot());
if (!private_slot)
return false;
- scoped_refptr<net::CryptoModule> module(
- net::CryptoModule::CreateFromHandle(private_slot.get()));
+
net::CertificateList imported_certs;
- int import_result = nssdb->ImportFromPKCS12(
- module.get(), decoded_pkcs12, base::string16(), false, &imported_certs);
+ int import_result =
+ nssdb->ImportFromPKCS12(private_slot.get(), decoded_pkcs12,
+ base::string16(), false, &imported_certs);
if (import_result != net::OK) {
std::string error_string = net::ErrorToString(import_result);
LOG(ERROR) << "Unable to import client certificate, error: "
« no previous file with comments | « chrome/browser/ui/webui/settings/certificates_handler.cc ('k') | net/cert/nss_cert_database.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698