Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/pk11wrap/pk11merge.c

 /*
  * Merge the source token into the target token.
  */
 
 #include "secmod.h"
 #include "secmodi.h"
 #include "secmodti.h"
 #include "pk11pub.h"
 #include "pk11priv.h"
 #include "pkcs11.h"
@@ skipping 303 matching lines @@
  *
  *************************************************************************/
 
 /*
  * we need to find a unique CKA_ID.
  *  The basic idea is to just increment the lowest byte.
  *  This code also handles the following corner cases:
  *   1) the single byte overflows. On overflow we increment the next byte up 
  *    and so forth until we have overflowed the entire CKA_ID.
  *   2) If we overflow the entire CKA_ID we expand it by one byte.
- *   3) the CKA_ID is non-existant, we create a new one with one byte.
+ *   3) the CKA_ID is non-existent, we create a new one with one byte.
  *    This means no matter what CKA_ID is passed, the result of this function 
  *    is always a new CKA_ID, and this function will never return the same 
  *    CKA_ID the it has returned in the passed.
  */
 static SECStatus
 pk11_incrementID(PRArenaPool *arena, CK_ATTRIBUTE *ptemplate)
 {
     unsigned char *buf = ptemplate->pValue;
     CK_ULONG len = ptemplate->ulValueLen;
 
@@ skipping 1071 matching lines @@
     return log;
 }
 
 void
 PK11_DestroyMergeLog(PK11MergeLog *log)
 {
    if (log && log->arena) {
         PORT_FreeArena(log->arena, PR_FALSE);
     }
 }