Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pkcs7/p7local.c

Index: nss/lib/pkcs7/p7local.c
diff --git a/nss/lib/pkcs7/p7local.c b/nss/lib/pkcs7/p7local.c
index 6a7af1f809eb1a3f034de7fd2d5538ad3bea4030..5e67a0ebaadab8f07db9adb6f03f87a14e800f5e 100644
--- a/nss/lib/pkcs7/p7local.c
+++ b/nss/lib/pkcs7/p7local.c
@@ -203,7 +203,8 @@ sec_PKCS7CreateEncryptObject (PLArenaPool *poolp, PK11SymKey *key,
 	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;
 	}
     }
@@ -397,7 +398,7 @@ sec_PKCS7Decrypt (sec_PKCS7CipherObject *obj, unsigned char *output,
 		  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;