| Index: net/cert/nss_cert_database.cc
|
| diff --git a/net/cert/nss_cert_database.cc b/net/cert/nss_cert_database.cc
|
| index 6842643d5f68e6ee5cfc5dd03c76d1701dc65c0a..d94030c9cbcc2f3db8ee7011ff8f875e65561c1f 100644
|
| --- a/net/cert/nss_cert_database.cc
|
| +++ b/net/cert/nss_cert_database.cc
|
| @@ -176,15 +176,15 @@ void NSSCertDatabase::ListModules(CryptoModuleList* modules,
|
| }
|
| }
|
|
|
| -int NSSCertDatabase::ImportFromPKCS12(CryptoModule* module,
|
| +int NSSCertDatabase::ImportFromPKCS12(PK11SlotInfo* slot_info,
|
| const std::string& data,
|
| const base::string16& password,
|
| bool is_extractable,
|
| CertificateList* imported_certs) {
|
| DVLOG(1) << __func__ << " "
|
| - << PK11_GetModuleID(module->os_module_handle()) << ":"
|
| - << PK11_GetSlotID(module->os_module_handle());
|
| - int result = psm::nsPKCS12Blob_Import(module->os_module_handle(),
|
| + << PK11_GetModuleID(slot_info) << ":"
|
| + << PK11_GetSlotID(slot_info);
|
| + int result = psm::nsPKCS12Blob_Import(slot_info,
|
| data.data(), data.size(),
|
| password,
|
| is_extractable,
|
|
|