summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12/p12_npas.c
diff options
context:
space:
mode:
authorUlf Möller <ulf@openssl.org>2000-05-15 22:54:43 +0000
committerUlf Möller <ulf@openssl.org>2000-05-15 22:54:43 +0000
commit0e1c06128adbfd2d88dc304db2262140bad045fd (patch)
tree11e9bdbd479a92c1cddc1b583543890bc95adb03 /crypto/pkcs12/p12_npas.c
parent0c109ea2cbf3f2ba027fb45c744fb52f7a3f0009 (diff)
Get rid of more non-ANSI declarations.
Diffstat (limited to 'crypto/pkcs12/p12_npas.c')
-rw-r--r--crypto/pkcs12/p12_npas.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/pkcs12/p12_npas.c b/crypto/pkcs12/p12_npas.c
index ee71707e2c..4fb0cf74ab 100644
--- a/crypto/pkcs12/p12_npas.c
+++ b/crypto/pkcs12/p12_npas.c
@@ -123,26 +123,26 @@ static int newpass_p12(PKCS12 *p12, char *oldpass, char *newpass)
&pbe_nid, &pbe_iter, &pbe_saltlen);
} else continue;
if (!bags) {
- sk_pop_free(asafes, PKCS7_free);
+ sk_pop_free(asafes, (void(*)(void *)) PKCS7_free);
return 0;
}
if (!newpass_bags(bags, oldpass, newpass)) {
- sk_pop_free(bags, PKCS12_SAFEBAG_free);
- sk_pop_free(asafes, PKCS7_free);
+ sk_pop_free(bags, (void(*)(void *)) PKCS12_SAFEBAG_free);
+ sk_pop_free(asafes, (void(*)(void *)) PKCS7_free);
return 0;
}
/* Repack bag in same form with new password */
if (bagnid == NID_pkcs7_data) p7new = PKCS12_pack_p7data(bags);
else p7new = PKCS12_pack_p7encdata(pbe_nid, newpass, -1, NULL,
pbe_saltlen, pbe_iter, bags);
- sk_pop_free(bags, PKCS12_SAFEBAG_free);
+ sk_pop_free(bags, (void(*)(void *)) PKCS12_SAFEBAG_free);
if(!p7new) {
- sk_pop_free(asafes, PKCS7_free);
+ sk_pop_free(asafes, (void(*)(void *)) PKCS7_free);
return 0;
}
sk_push(newsafes, (char *)p7new);
}
- sk_pop_free(asafes, PKCS7_free);
+ sk_pop_free(asafes, (void(*)(void *)) PKCS7_free);
/* Repack safe: save old safe in case of error */