Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pkcs7/p7encode.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 encoding.
  */
 
 #include "p7local.h"
 
@@ skipping 41 matching lines @@
 sec_pkcs7_encoder_start_encrypt (SEC_PKCS7ContentInfo *cinfo,
                                                  PK11SymKey *orig_bulkkey)
 {
     SECOidTag kind;
     sec_PKCS7CipherObject *encryptobj;
     SEC_PKCS7RecipientInfo **recipientinfos, *ri;
     SEC_PKCS7EncryptedContentInfo *enccinfo;
     SECKEYPublicKey *publickey = NULL;
     SECKEYPrivateKey *ourPrivKey = NULL;
     PK11SymKey  *bulkkey;
-    void *mark, *wincx;
+    void *mark;
     int i;
     PLArenaPool *arena = NULL;
 
-    /* Get the context in case we need it below. */
-    wincx = cinfo->pwfn_arg;
-
     kind = SEC_PKCS7ContentType (cinfo);
     switch (kind) {
       default:
       case SEC_OID_PKCS7_DATA:
       case SEC_OID_PKCS7_DIGESTED_DATA:
       case SEC_OID_PKCS7_SIGNED_DATA:
         recipientinfos = NULL;
         enccinfo = NULL;
         break;
       case SEC_OID_PKCS7_ENCRYPTED_DATA:
@@ skipping 1022 matching lines @@
 {
     SECStatus rv;
 
     rv = SEC_PKCS7PrepareForEncode (cinfo, bulkkey, pwfn, pwfnarg);
     if (rv != SECSuccess)
         return NULL;
 
     return SEC_ASN1EncodeItem (pool, dest, cinfo, sec_PKCS7ContentInfoTemplate);
 }