Update NSS to NSS 3.14 pre-release snapshot 2012-06-28 01:00:00 PDT.

mozilla/security/nss/lib/softoken/sftkpwd.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /* 
  *  The following code handles the storage of PKCS 11 modules used by the
  * NSS. For the rest of NSS, only one kind of database handle exists:
  *
  *     SFTKDBHandle
  *
  * There is one SFTKDBHandle for the each key database and one for each cert 
  * database. These databases are opened as associated pairs, one pair per
  * slot. SFTKDBHandles are reference counted objects.
  *
  * Each SFTKDBHandle points to a low level database handle (SDB). This handle
  * represents the underlying physical database. These objects are not 
  * reference counted, an are 'owned' by their respective SFTKDBHandles.
  *
  *  
  */
 #include "sftkdb.h"
 #include "sftkdbti.h"
 #include "pkcs11t.h"
 #include "pkcs11i.h"
 #include "sdb.h"
 #include "prprf.h" 
-#include "secmodt.h"
-#include "sftkpars.h"
+#include "secasn1.h"
 #include "pratom.h"
 #include "blapi.h"
 #include "secoid.h"
-#include "sechash.h"
 #include "lowpbe.h"
 #include "secdert.h"
 #include "prsystem.h"
 #include "lgglue.h"
 #include "secerr.h"
 #include "softoken.h"
   
 /******************************************************************
  * 
  * Key DB password handling functions
@@ skipping 1226 matching lines @@
     oldKey.data = NULL;
     oldKey.len = 0;
     sftkdb_switchKeys(keydb, &oldKey);
     if (oldKey.data) {
         PORT_ZFree(oldKey.data, oldKey.len);
     }
     return SECSuccess;
 }