Update to NSS 3.12.7 and NSPR 4.8.6....

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

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 199 matching lines @@
 
 /*
  * destroy a symetric key
  */
 void
 PK11_FreeSymKey(PK11SymKey *symKey)
 {
     PK11SlotInfo *slot;
     PRBool freeit = PR_TRUE;
 
-    if (PR_AtomicDecrement(&symKey->refCount) == 0) {
+    if (PR_ATOMIC_DECREMENT(&symKey->refCount) == 0) {
         PK11SymKey *parent = symKey->parent;
 
         symKey->parent = NULL;
         if ((symKey->owner) && symKey->objectID != CK_INVALID_HANDLE) {
             pk11_EnterKeyMonitor(symKey);
             (void) PK11_GETTAB(symKey->slot)->
                 C_DestroyObject(symKey->session, symKey->objectID);
             pk11_ExitKeyMonitor(symKey);
         }
         if (symKey->data.data) {
@@ skipping 41 matching lines @@
 
         if (parent) {
             PK11_FreeSymKey(parent);
         }
     }
 }
 
 PK11SymKey *
 PK11_ReferenceSymKey(PK11SymKey *symKey)
 {
-    PR_AtomicIncrement(&symKey->refCount);
+    PR_ATOMIC_INCREMENT(&symKey->refCount);
     return symKey;
 }
 
 /*
  * Accessors
  */
 CK_MECHANISM_TYPE
 PK11_GetMechanism(PK11SymKey *symKey)
 {
     return symKey->type;
@@ skipping 854 matching lines @@
 {
     PK11SlotInfo *slot;
     CK_ULONG len =  wrappedKey->len;
     PK11SymKey *newKey = NULL;
     CK_OBJECT_HANDLE id;
     CK_MECHANISM mechanism;
     PRBool owner = PR_TRUE;
     CK_SESSION_HANDLE session;
     CK_RV crv;
 
+    if (symKey == NULL) {
+        PORT_SetError( SEC_ERROR_INVALID_ARGS );
+        return SECFailure;
+    }
+
     /* if this slot doesn't support the mechanism, go to a slot that does */
     newKey = pk11_ForceSlot(symKey,type,CKA_ENCRYPT);
     if (newKey != NULL) {
         symKey = newKey;
     }
 
-    if ((symKey == NULL) || (symKey->slot == NULL)) {
+    if (symKey->slot == NULL) {
         PORT_SetError( SEC_ERROR_NO_MODULE );
         return SECFailure;
     }
 
     slot = symKey->slot;
     mechanism.mechanism = pk11_mapWrapKeyType(pubKey->keyType);
     mechanism.pParameter = NULL;
     mechanism.ulParameterLen = 0;
 
     id = PK11_ImportPublicKey(slot,pubKey,PR_FALSE);
@@ skipping 1128 matching lines @@
     PK11_ExitSlotMonitor(symKey->slot);
     return rv;
 }
 
 CK_OBJECT_HANDLE
 PK11_GetSymKeyHandle(PK11SymKey *symKey)
 {
     return symKey->objectID;
 }