Fix import Firefox passwords on Windows (silent failure); plds4.dll and nspr4.dll no longer exist

chrome/utility/importer/nss_decryptor_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/utility/importer/nss_decryptor_win.h"
 
 #include "base/files/file_path.h"
 #include "base/strings/sys_string_conversions.h"
 
 namespace {
@@ skipping 67 matching lines @@
     // harmless for NSS 3.11.
     path = base::FilePath(dll_path).Append(kSoftokn3Library);
     softokn3_dll_ = LoadLibraryEx(path.value().c_str(), NULL,
                                   LOAD_WITH_ALTERED_SEARCH_PATH);
     if (softokn3_dll_ == NULL) {
       Free();
       return false;
     }
   }
   HMODULE plds4_dll = GetModuleHandle(kPLDS4Library);
   HMODULE nspr4_dll = GetModuleHandle(kNSPR4Library);

[wtc, 2013/09/11 23:44:03]

We can also handle the problem here:

  // On Firefox 22 and higher, NSPR is part of nss3.dll rather than separate
DLLs.
  if (plds4_dll == NULL) {
    plds4_dll = nss3_dll_;
    nspr4_dll = nss3_dll_;
  }

And then in NSSDecryptor::InitNSS you just need to delete
  // NSPR DLLs are already loaded now.
  if (plds4_dll == NULL || nspr4_dll == NULL) {
    Free();
    return false;
  }

 
   return InitNSS(db_path, plds4_dll, nspr4_dll);
 }
 
 NSSDecryptor::NSSDecryptor()
     : NSS_Init(NULL), NSS_Shutdown(NULL), PK11_GetInternalKeySlot(NULL),
       PK11_CheckUserPassword(NULL), PK11_FreeSlot(NULL),
       PK11_Authenticate(NULL), PK11SDR_Decrypt(NULL), SECITEM_FreeItem(NULL),
       PL_ArenaFinish(NULL), PR_Cleanup(NULL),
       nss3_dll_(NULL), softokn3_dll_(NULL),
       is_nss_initialized_(false) {
 }
 
 NSSDecryptor::~NSSDecryptor() {
   Free();
 }
 
 bool NSSDecryptor::InitNSS(const base::FilePath& db_path,
                            base::NativeLibrary plds4_dll,
                            base::NativeLibrary nspr4_dll) {
-  // NSPR DLLs are already loaded now.
-  if (plds4_dll == NULL || nspr4_dll == NULL) {
-    Free();
-    return false;
-  }
-
   // Gets the function address.
   NSS_Init = (NSSInitFunc)
       base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "NSS_Init");
   NSS_Shutdown = (NSSShutdownFunc)
       base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "NSS_Shutdown");
   PK11_GetInternalKeySlot = (PK11GetInternalKeySlotFunc)
       base::GetFunctionPointerFromNativeLibrary(nss3_dll_,
                                                 "PK11_GetInternalKeySlot");
   PK11_FreeSlot = (PK11FreeSlotFunc)
       base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "PK11_FreeSlot");
   PK11_Authenticate = (PK11AuthenticateFunc)
       base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "PK11_Authenticate");
   PK11SDR_Decrypt = (PK11SDRDecryptFunc)
       base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "PK11SDR_Decrypt");
   SECITEM_FreeItem = (SECITEMFreeItemFunc)
       base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "SECITEM_FreeItem");
-  PL_ArenaFinish = (PLArenaFinishFunc)
-      base::GetFunctionPointerFromNativeLibrary(plds4_dll, "PL_ArenaFinish");
-  PR_Cleanup = (PRCleanupFunc)
-      base::GetFunctionPointerFromNativeLibrary(nspr4_dll, "PR_Cleanup");
+  // On Firefox 22 and higher, PL_ArenaFinish() and PR_Cleanup() are found in
+  // nss3.dll rather than plds4.dll.

[wtc, 2013/09/11 23:44:03]

plds4.dll => plds4.dll and nspr4.dll.

This is a recent change in Firefox, although I don't know if the change was
made in Firefox 22. Several NSPR and NSS DLLs are combined into a single
nss3.dll.

+  if (plds4_dll == NULL) {
+    PL_ArenaFinish = (PLArenaFinishFunc)(
+        base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "PL_ArenaFinish"));
+    PR_Cleanup = (PRCleanupFunc)(
+        base::GetFunctionPointerFromNativeLibrary(nss3_dll_, "PR_Cleanup"));
+  } else {
+    PL_ArenaFinish = (PLArenaFinishFunc)(
+        base::GetFunctionPointerFromNativeLibrary(nspr4_dll, "PL_ArenaFinish"));

[Ilya Sherman, 2013/09/11 23:39:40]

Unless I'm misreading something, this was plds4_dll previously.  Did you
intentionally change it?

[wtc, 2013/09/11 23:44:03]

We need to use plds4_dll here.

+    PR_Cleanup = (PRCleanupFunc)(
+        base::GetFunctionPointerFromNativeLibrary(nspr4_dll, "PR_Cleanup"));
+  }
 
   if (NSS_Init == NULL || NSS_Shutdown == NULL ||
       PK11_GetInternalKeySlot == NULL || PK11_FreeSlot == NULL ||
       PK11_Authenticate == NULL || PK11SDR_Decrypt == NULL ||
       SECITEM_FreeItem == NULL || PL_ArenaFinish == NULL ||
       PR_Cleanup == NULL) {
     Free();
     return false;
   }
 
@@ skipping 23 matching lines @@
   PK11_GetInternalKeySlot = NULL;
   PK11_FreeSlot = NULL;
   PK11_Authenticate = NULL;
   PK11SDR_Decrypt = NULL;
   SECITEM_FreeItem = NULL;
   PL_ArenaFinish = NULL;
   PR_Cleanup = NULL;
   nss3_dll_ = NULL;
   softokn3_dll_ = NULL;
 }