Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pkcs7/p7common.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/. */
 
 /*
  * PKCS7 implementation -- the exported parts that are used whether
  * creating or decoding.
  */
 
 #include "p7local.h"
@@ skipping 390 matching lines @@
  * in the event of an error, SECFailure is returned.  SECSuccess
  * indicates a success.
  */
 SECStatus 
 SEC_PKCS7EncryptContents(PLArenaPool *poolp,
                          SEC_PKCS7ContentInfo *cinfo,
                          SECItem *key,
                          void *wincx)
 {
     SECAlgorithmID *algid       = NULL;
-    SECItem *       result      = NULL;
     SECItem *       src;
     SECItem *       dest;
     SECItem *       blocked_data = NULL;
     void *          mark;
     void *          cx;
     PK11SymKey *    eKey        = NULL;
     PK11SlotInfo *  slot        = NULL;
 
     CK_MECHANISM_TYPE cryptoMechType;
     int             bs;
@@ skipping 95 matching lines @@
     rv = PK11_CipherOp((PK11Context*)cx, dest->data, (int *)(&dest->len), 
                        (int)(src->len + 64), blocked_data->data, 
                        (int)blocked_data->len);
     PK11_DestroyContext((PK11Context*)cx, PR_TRUE);
 
 loser:
     /* let success fall through */
     if(blocked_data != NULL)
         SECITEM_ZfreeItem(blocked_data, PR_TRUE);
 
-    if(result != NULL)
-        SECITEM_ZfreeItem(result, PR_TRUE);
-
     if(rv == SECFailure)
         PORT_ArenaRelease(poolp, mark);
     else 
         PORT_ArenaUnmark(poolp, mark);
 
     if(eKey != NULL)
         PK11_FreeSymKey(eKey);
 
     if(slot != NULL)
         PK11_FreeSlot(slot);
@@ skipping 19 matching lines @@
  * indicates a success.
  */
 SECStatus 
 SEC_PKCS7DecryptContents(PLArenaPool *poolp,
                          SEC_PKCS7ContentInfo *cinfo,
                          SECItem *key,
                          void *wincx)
 {
     SECAlgorithmID *algid = NULL;
     SECStatus rv = SECFailure;
-    SECItem *result = NULL, *dest, *src;
+    SECItem *dest, *src;
     void *mark;
 
     PK11SymKey *eKey = NULL;
     PK11SlotInfo *slot = NULL;
     CK_MECHANISM_TYPE cryptoMechType;
     void *cx;
     SECItem *c_param = NULL;
     int bs;
 
     if((cinfo == NULL) || (key == NULL))
@@ skipping 58 matching lines @@
            ((int)dest->data[dest->len-1] > 0)) {
             dest->len -= (int)dest->data[dest->len-1];
         } else {
             rv = SECFailure;
             /* set an error ? */
         }
     } 
 
 loser:
     /* let success fall through */
-    if(result != NULL)
-        SECITEM_ZfreeItem(result, PR_TRUE);
-
     if(rv == SECFailure)
         PORT_ArenaRelease(poolp, mark);
     else
         PORT_ArenaUnmark(poolp, mark);
 
     if(eKey != NULL)
         PK11_FreeSymKey(eKey);
 
     if(slot != NULL)
         PK11_FreeSlot(slot);
@@ skipping 21 matching lines @@
 
 int
 SEC_PKCS7GetKeyLength(SEC_PKCS7ContentInfo *cinfo)
 {
   if (cinfo->contentTypeTag->offset == SEC_OID_PKCS7_ENVELOPED_DATA)
     return cinfo->content.envelopedData->encContentInfo.keysize;
   else
     return 0;
 }