Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pkcs7/p7local.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/. */
 
 /*
  * Support routines for PKCS7 implementation, none of which are exported.
  * This file should only contain things that are needed by both the
  * encoding/creation side *and* the decoding/decryption side.  Anything
  * else should be static routines in the appropriate file.
  */
@@ skipping 185 matching lines @@
 
     /*
      * These are placed after the CreateContextBySymKey() because some
      * mechanisms have to generate their IVs from their card (i.e. FORTEZZA).
      * Don't move it from here.
      */
     if (needToEncodeAlgid) {
         rv = PK11_ParamToAlgid(algtag,param,poolp,algid);
         if(rv != SECSuccess) {
             PORT_Free (result);
-            SECITEM_FreeItem(param,PR_TRUE);
+            SECITEM_FreeItem(param,PR_TRUE);
+            PK11_DestroyContext(ciphercx, PR_TRUE);
             return NULL;
         }
     }
     SECITEM_FreeItem(param,PR_TRUE);
 
     result->cx = ciphercx;
     result->doit = (sec_pkcs7_cipher_function) PK11_CipherOp;
     result->destroy = (sec_pkcs7_cipher_destroy) PK11_DestroyContext;
     result->encrypt = PR_TRUE;
     result->pending_count = 0;
@@ skipping 173 matching lines @@
  * the same as the length of the padding, and that all data is padded.
  * (Even data that starts out with an exact multiple of blocks gets
  * added to it another block, all of which is padding.)
  */ 
 SECStatus
 sec_PKCS7Decrypt (sec_PKCS7CipherObject *obj, unsigned char *output,
                   unsigned int *output_len_p, unsigned int max_output_len,
                   const unsigned char *input, unsigned int input_len,
                   PRBool final)
 {
-    int blocks, bsize, pcount, padsize;
+    unsigned int blocks, bsize, pcount, padsize;
     unsigned int max_needed, ifraglen, ofraglen, output_len;
     unsigned char *pbuf;
     SECStatus rv;
 
     PORT_Assert (! obj->encrypt);
 
     /*
      * Check that we have enough room for the output.  Our caller should
      * already handle this; failure is really an internal error (i.e. bug).
      */
@@ skipping 899 matching lines @@
         theTemplate = SEC_PointerToPKCS7EncryptedDataTemplate;
         break;
     }
     return theTemplate;
 }
 
 /*
  * End of templates.  Do not add stuff after this; put new code
  * up above the start of the template definitions.
  */