Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pkcs7/p7common.c

Index: nss/lib/pkcs7/p7common.c
diff --git a/nss/lib/pkcs7/p7common.c b/nss/lib/pkcs7/p7common.c
index 9a44f20b388f3c46b4b90d47f49f669403c07ba3..10015ce25b1fdad99826f644ac028616d9b051c9 100644
--- a/nss/lib/pkcs7/p7common.c
+++ b/nss/lib/pkcs7/p7common.c
@@ -408,7 +408,6 @@ SEC_PKCS7EncryptContents(PLArenaPool *poolp,
 			 void *wincx)
 {
     SECAlgorithmID *algid 	= NULL;
-    SECItem *       result 	= NULL;
     SECItem *       src;
     SECItem *       dest;
     SECItem *       blocked_data = NULL;
@@ -524,9 +523,6 @@ loser:
     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 
@@ -566,7 +562,7 @@ SEC_PKCS7DecryptContents(PLArenaPool *poolp,
 {
     SECAlgorithmID *algid = NULL;
     SECStatus rv = SECFailure;
-    SECItem *result = NULL, *dest, *src;
+    SECItem *dest, *src;
     void *mark;
 
     PK11SymKey *eKey = NULL;
@@ -645,9 +641,6 @@ SEC_PKCS7DecryptContents(PLArenaPool *poolp,
 
 loser:
     /* let success fall through */
-    if(result != NULL)
-	SECITEM_ZfreeItem(result, PR_TRUE);
-
     if(rv == SECFailure)
 	PORT_ArenaRelease(poolp, mark);
     else