Uprev NSS to 3.18 RTM

nss/lib/pk11wrap/dev3hack.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/. */
 
 #ifndef PKIT_H
 #include "pkit.h"
 #endif /* PKIT_H */
 
 #ifndef DEVM_H
 #include "devm.h"
@@ skipping 74 matching lines @@
     rvSession->ownLock = PR_FALSE;
     return rvSession;
 }
 
 NSS_IMPLEMENT PRStatus
 nssSession_Destroy
 (
   nssSession *s
 )
 {
-    CK_RV ckrv = CKR_OK;
+    PRStatus rv = PR_SUCCESS;
     if (s) {
         if (s->isRW) {
             PK11_RestoreROSession(s->slot->pk11slot, s->handle);
         }
-        nss_ZFreeIf(s);
+        rv = nss_ZFreeIf(s);
     }
-    return (ckrv == CKR_OK) ? PR_SUCCESS : PR_FAILURE;
+    return rv;
 }
 
 static NSSSlot *
 nssSlot_CreateFromPK11SlotInfo(NSSTrustDomain *td, PK11SlotInfo *nss3slot)
 {
     NSSSlot *rvSlot;
     NSSArena *arena;
     arena = nssArena_Create();
     if (!arena) {
         return NULL;
@@ skipping 183 matching lines @@
 
 NSS_IMPLEMENT PRStatus
 nssToken_NotifyCertsNotVisible
 (
   NSSToken *tok
 )
 {
     return nssTrustDomain_RemoveTokenCertsFromCache(tok->trustDomain, tok);
 }