diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2015-08-12 09:44:25 -0700 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2015-08-12 09:44:25 -0700 |
| commit | 225703849bf43ff466e4dcfd3b68c30486e8ad12 (patch) | |
| tree | a6970da1dad182eb7e0d6a346cec7bb89205a789 /cmd/signtool | |
| parent | df18e4c7e5e9ad31fab45575896fba7d2bc24250 (diff) | |
| download | nss-hg-225703849bf43ff466e4dcfd3b68c30486e8ad12.tar.gz | |
Backed out changeset 4355f55afeb2 (Bug 1158489)
Diffstat (limited to 'cmd/signtool')
| -rw-r--r-- | cmd/signtool/certgen.c | 3 | ||||
| -rw-r--r-- | cmd/signtool/util.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/cmd/signtool/certgen.c b/cmd/signtool/certgen.c index 0f7c596dd..92c33fdb9 100644 --- a/cmd/signtool/certgen.c +++ b/cmd/signtool/certgen.c @@ -420,6 +420,7 @@ 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); @@ -439,7 +440,7 @@ sign_cert(CERTCertificate *cert, SECKEYPrivateKey *privk) der2.len = 0; der2.data = NULL; - (void)SEC_ASN1EncodeItem + dummy = 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 73568d1ba..74a208e5e 100644 --- a/cmd/signtool/util.c +++ b/cmd/signtool/util.c @@ -16,11 +16,9 @@ static int is_dir (char *filename); long *mozilla_event_queue = 0; #ifndef XP_WIN -char *XP_GetString (int i) +char *XP_GetString (int i) { - /* nasty hackish cast to avoid changing the signature of - * JAR_init_callbacks() */ - return (char *)SECU_Strerror (i); + return SECU_Strerror (i); } #endif |