Merge NSS_3_14_2_RTM.

mozilla/security/nss/lib/pkcs7/p7decode.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 decoding, verification.
  *
- * $Id: p7decode.c,v 1.30 2012/11/27 22:48:08 bsmith%mozilla.com Exp $
+ * $Id: p7decode.c,v 1.31 2012/12/12 19:25:36 wtc%google.com Exp $
  */
 
 #include "p7local.h"
 
 #include "cert.h"
                                 /* XXX do not want to have to include */
 #include "certdb.h"             /* certdb.h -- the trust stuff needed by */
                                 /* the add certificate code needs to get */
                                 /* rewritten/abstracted and then this */
                                 /* include should be removed! */
@@ skipping 381 matching lines @@
 sec_pkcs7_decoder_get_recipient_key (SEC_PKCS7DecoderContext *p7dcx,
                                      SEC_PKCS7RecipientInfo **recipientinfos,
                                      SEC_PKCS7EncryptedContentInfo *enccinfo)
 {
     SEC_PKCS7RecipientInfo *ri;
     CERTCertificate *cert = NULL;
     SECKEYPrivateKey *privkey = NULL;
     PK11SymKey *bulkkey = NULL;
     SECOidTag keyalgtag, bulkalgtag, encalgtag;
     PK11SlotInfo *slot = NULL;
-    int bulkLength = 0;
 
     if (recipientinfos == NULL || recipientinfos[0] == NULL) {
         p7dcx->error = SEC_ERROR_NOT_A_RECIPIENT;
         goto no_key_found;
     }
 
     cert = PK11_FindCertAndKeyByRecipientList(&slot,recipientinfos,&ri,
                                                 &privkey, p7dcx->pwfn_arg);
     if (cert == NULL) {
         p7dcx->error = SEC_ERROR_NOT_A_RECIPIENT;
@@ skipping 1480 matching lines @@
     /*
      * No signature, or more than one, means no deal.
      */
     if (signerinfos == NULL || signerinfos[0] == NULL || signerinfos[1] != NULL)
         return NULL;
 
     attr = sec_PKCS7FindAttribute (signerinfos[0]->authAttr,
                                    SEC_OID_PKCS9_SIGNING_TIME, PR_TRUE);
     return sec_PKCS7AttributeValue (attr);
 }