diff options
author | Ulf Möller <ulf@openssl.org> | 2000-05-15 22:54:43 +0000 |
---|---|---|
committer | Ulf Möller <ulf@openssl.org> | 2000-05-15 22:54:43 +0000 |
commit | 0e1c06128adbfd2d88dc304db2262140bad045fd (patch) | |
tree | 11e9bdbd479a92c1cddc1b583543890bc95adb03 /apps | |
parent | 0c109ea2cbf3f2ba027fb45c744fb52f7a3f0009 (diff) | |
download | openssl-0e1c06128adbfd2d88dc304db2262140bad045fd.tar.gz |
Get rid of more non-ANSI declarations.
Diffstat (limited to 'apps')
-rw-r--r-- | apps/ca.c | 2 | ||||
-rw-r--r-- | apps/pkcs12.c | 12 |
2 files changed, 7 insertions, 7 deletions
@@ -1233,7 +1233,7 @@ err: BIO_free(out); BIO_free(in); - sk_pop_free(cert_sk,X509_free); + sk_pop_free(cert_sk, (void(*)(void *)) X509_free); if (ret) ERR_print_errors(bio_err); app_RAND_write_file(randfile, bio_err); diff --git a/apps/pkcs12.c b/apps/pkcs12.c index baf5505ecb..0c03801afe 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -459,7 +459,7 @@ int MAIN(int argc, char **argv) /* Turn certbags into encrypted authsafe */ authsafe = PKCS12_pack_p7encdata(cert_pbe, cpass, -1, NULL, 0, iter, bags); - sk_pop_free(bags, PKCS12_SAFEBAG_free); + sk_pop_free(bags, (void(*)(void *)) PKCS12_SAFEBAG_free); if (!authsafe) { ERR_print_errors (bio_err); @@ -481,14 +481,14 @@ int MAIN(int argc, char **argv) sk_push (bags, (char *)bag); /* Turn it into unencrypted safe bag */ authsafe = PKCS12_pack_p7data (bags); - sk_pop_free(bags, PKCS12_SAFEBAG_free); + sk_pop_free(bags, (void(*)(void *)) PKCS12_SAFEBAG_free); sk_push (safes, (char *)authsafe); p12 = PKCS12_init (NID_pkcs7_data); M_PKCS12_pack_authsafes (p12, safes); - sk_pop_free(safes, PKCS7_free); + sk_pop_free(safes, (void(*)(void *)) PKCS7_free); PKCS12_set_mac (p12, mpass, -1, NULL, 0, maciter, NULL); @@ -592,12 +592,12 @@ int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass, if (!bags) return 0; if (!dump_certs_pkeys_bags (out, bags, pass, passlen, options, pempass)) { - sk_pop_free (bags, PKCS12_SAFEBAG_free); + sk_pop_free (bags, (void(*)(void *)) PKCS12_SAFEBAG_free); return 0; } - sk_pop_free (bags, PKCS12_SAFEBAG_free); + sk_pop_free (bags, (void(*)(void *)) PKCS12_SAFEBAG_free); } - sk_pop_free (asafes, PKCS7_free); + sk_pop_free (asafes, (void(*)(void *)) PKCS7_free); return 1; } |