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

mozilla/security/nss/lib/pk11wrap/pk11priv.h

 /* 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/. */
 #ifndef _PK11PRIV_H_
 #define _PK11PRIV_H_
 #include "plarena.h"
 #include "seccomon.h"
 #include "secoidt.h"
 #include "secdert.h"
 #include "keyt.h"
@@ skipping 41 matching lines @@
                                          CK_SESSION_HANDLE session_handle);
 PK11SlotInfo *PK11_NewSlotInfo(SECMODModule *mod);
 void PK11_EnterSlotMonitor(PK11SlotInfo *);
 void PK11_ExitSlotMonitor(PK11SlotInfo *);
 void PK11_CleanKeyList(PK11SlotInfo *slot);
 
 
 /************************************************************
  *  Slot Password Management
  ************************************************************/
-SECStatus PK11_DoPassword(PK11SlotInfo *slot, PRBool loadCerts, void *wincx);
+SECStatus PK11_DoPassword(PK11SlotInfo *slot, PRBool loadCerts, void *wincx,
+                                PRBool contextSpecific);
 SECStatus PK11_VerifyPW(PK11SlotInfo *slot,char *pw);
 void PK11_HandlePasswordCheck(PK11SlotInfo *slot,void *wincx);
 void PK11_SetVerifyPasswordFunc(PK11VerifyPasswordFunc func);
 void PK11_SetIsLoggedInFunc(PK11IsLoggedInFunc func);
 
 /************************************************************
  * Manage the built-In Slot Lists
  ************************************************************/
 SECStatus PK11_InitSlotLists(void);
 void PK11_DestroySlotLists(void);
@@ skipping 107 matching lines @@
 SECStatus pk11_setGlobalOptions(PRBool noSingleThreadedModules,
                                 PRBool allowAlreadyInitializedModules,
                                 PRBool dontFinalizeModules);
 
 /* return whether NSS is allowed to call C_Finalize */
 PRBool pk11_getFinalizeModulesOption(void);
 
 SEC_END_PROTOS
 
 #endif