diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2015-08-17 11:22:29 -0700 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2015-08-17 11:22:29 -0700 |
| commit | edfddd7b86ae3cc6b1b2440216d4b83cdd9f321b (patch) | |
| tree | 243150dab7af42c35c08dd056ee854bad24a1bdd /lib/pkcs7 | |
| parent | 03d2e2d3d9d618778194c3759dee4bc625310f55 (diff) | |
| download | nss-hg-edfddd7b86ae3cc6b1b2440216d4b83cdd9f321b.tar.gz | |
Bug 1182667 - Enable warnings as errors, r=rrelyea
Diffstat (limited to 'lib/pkcs7')
| -rw-r--r-- | lib/pkcs7/p7decode.c | 3 | ||||
| -rw-r--r-- | lib/pkcs7/p7encode.c | 5 | ||||
| -rw-r--r-- | lib/pkcs7/p7local.c | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/lib/pkcs7/p7decode.c b/lib/pkcs7/p7decode.c index 80689544e..7a52d8203 100644 --- a/lib/pkcs7/p7decode.c +++ b/lib/pkcs7/p7decode.c @@ -1290,7 +1290,6 @@ sec_pkcs7_verify_signature(SEC_PKCS7ContentInfo *cinfo, const SECItem *digest; SECItem **digests; SECItem **rawcerts; - CERTSignedCrl **crls; SEC_PKCS7SignerInfo **signerinfos, *signerinfo; CERTCertificate *cert, **certs; PRBool goodsig; @@ -1340,7 +1339,6 @@ sec_pkcs7_verify_signature(SEC_PKCS7ContentInfo *cinfo, digestalgs = sdp->digestAlgorithms; digests = sdp->digests; rawcerts = sdp->rawCerts; - crls = sdp->crls; signerinfos = sdp->signerInfos; content_type = &(sdp->contentInfo.contentType); sigkey = NULL; @@ -1355,7 +1353,6 @@ sec_pkcs7_verify_signature(SEC_PKCS7ContentInfo *cinfo, digestalgs = saedp->digestAlgorithms; digests = saedp->digests; rawcerts = saedp->rawCerts; - crls = saedp->crls; signerinfos = saedp->signerInfos; content_type = &(saedp->encContentInfo.contentType); sigkey = saedp->sigKey; diff --git a/lib/pkcs7/p7encode.c b/lib/pkcs7/p7encode.c index 99b68ee51..349bc8461 100644 --- a/lib/pkcs7/p7encode.c +++ b/lib/pkcs7/p7encode.c @@ -59,13 +59,10 @@ sec_pkcs7_encoder_start_encrypt (SEC_PKCS7ContentInfo *cinfo, 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: diff --git a/lib/pkcs7/p7local.c b/lib/pkcs7/p7local.c index 6a7af1f80..8c5e0bfa5 100644 --- a/lib/pkcs7/p7local.c +++ b/lib/pkcs7/p7local.c @@ -397,7 +397,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; |