NSS: PKCS 11 password prompt.

net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp

Index: net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp
diff --git a/net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp b/net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp
index aae8d90c0067950c70b0479af5cf94a6e168ad6b..4ccc90e164ab087168845997e0cd44d2f560b153 100644
--- a/net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp
+++ b/net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp
@@ -259,17 +259,13 @@ void EnsurePKCS12Init() {
 }
 
 // Based on nsPKCS12Blob::ImportFromFile.
-int nsPKCS12Blob_Import(const char* pkcs12_data,
+int nsPKCS12Blob_Import(PK11SlotInfo* slot,
+                        const char* pkcs12_data,
                         size_t pkcs12_len,
                         const string16& password) {
-  base::ScopedPK11Slot slot(base::GetDefaultNSSKeySlot());
-  if (!slot.get()) {
-    LOG(ERROR) << "Couldn't get Internal key slot!";
-    return net::ERR_PKCS12_IMPORT_FAILED;
-  }
 
   int rv = nsPKCS12Blob_ImportHelper(pkcs12_data, pkcs12_len, password, false,
-                                     slot.get());
+                                     slot);
 
   // When the user entered a zero length password:
   //   An empty password should be represented as an empty
@@ -280,7 +276,7 @@ int nsPKCS12Blob_Import(const char* pkcs12_data,
   //   without giving a user prompt when trying the different empty password flavors.
   if (rv == net::ERR_PKCS12_IMPORT_BAD_PASSWORD && password.size() == 0) {
     rv = nsPKCS12Blob_ImportHelper(pkcs12_data, pkcs12_len, password, true,
-                                   slot.get());
+                                   slot);
   }
   return rv;
 }