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 /cmd/signtool | |
| parent | 03d2e2d3d9d618778194c3759dee4bc625310f55 (diff) | |
| download | nss-hg-edfddd7b86ae3cc6b1b2440216d4b83cdd9f321b.tar.gz | |
Bug 1182667 - Enable warnings as errors, r=rrelyea
Diffstat (limited to 'cmd/signtool')
| -rw-r--r-- | cmd/signtool/certgen.c | 3 | ||||
| -rw-r--r-- | cmd/signtool/util.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cmd/signtool/certgen.c b/cmd/signtool/certgen.c index 92c33fdb9..0f7c596dd 100644 --- a/cmd/signtool/certgen.c +++ b/cmd/signtool/certgen.c @@ -420,7 +420,6 @@ sign_cert(CERTCertificate *cert, SECKEYPrivateKey *privk) SECItem der2; SECItem * result2; - void *dummy; SECOidTag alg = SEC_OID_UNKNOWN; alg = SEC_GetSignatureAlgorithmOidTag(privk->keyType, SEC_OID_UNKNOWN); @@ -440,7 +439,7 @@ sign_cert(CERTCertificate *cert, SECKEYPrivateKey *privk) der2.len = 0; der2.data = NULL; - dummy = SEC_ASN1EncodeItem + (void)SEC_ASN1EncodeItem (cert->arena, &der2, cert, SEC_ASN1_GET(CERT_CertificateTemplate)); if (rv != SECSuccess) { diff --git a/cmd/signtool/util.c b/cmd/signtool/util.c index 74a208e5e..73568d1ba 100644 --- a/cmd/signtool/util.c +++ b/cmd/signtool/util.c @@ -16,9 +16,11 @@ static int is_dir (char *filename); long *mozilla_event_queue = 0; #ifndef XP_WIN -char *XP_GetString (int i) +char *XP_GetString (int i) { - return SECU_Strerror (i); + /* nasty hackish cast to avoid changing the signature of + * JAR_init_callbacks() */ + return (char *)SECU_Strerror (i); } #endif |