3 files changed, 14 insertions, 14 deletions

diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c
index ee8aed54c7..a60b128a3b 100644
--- a/crypto/pkcs12/p12_crt.c
+++ b/crypto/pkcs12/p12_crt.c
@@ -116,7 +116,7 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
 	/* Turn certbags into encrypted authsafe */
 	authsafe = PKCS12_pack_p7encdata (nid_cert, pass, -1, NULL, 0,
 					  iter, bags);
-	sk_pop_free(bags, PKCS12_SAFEBAG_free);
+	sk_pop_free(bags, (void(*)(void *)) PKCS12_SAFEBAG_free);
 
 	if (!authsafe) return NULL;
 
@@ -139,7 +139,7 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
 	}
 	/* Turn it into unencrypted safe bag */
 	if(!(authsafe = PKCS12_pack_p7data (bags))) return NULL;
-	sk_pop_free(bags, PKCS12_SAFEBAG_free);
+	sk_pop_free(bags, (void(*)(void *)) PKCS12_SAFEBAG_free);
 	if(!sk_push(safes, (char *)authsafe)) {
 		PKCS12err(PKCS12_F_PKCS12_CREATE,ERR_R_MALLOC_FAILURE);
 		return NULL;
@@ -149,7 +149,7 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
 
 	if(!M_PKCS12_pack_authsafes (p12, safes)) return NULL;
 
-	sk_pop_free(safes, PKCS7_free);
+	sk_pop_free(safes, (void(*)(void *)) PKCS7_free);
 
 	if(!PKCS12_set_mac (p12, pass, -1, NULL, 0, mac_iter, NULL))
 	    return NULL;
diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c
index 61c865b934..2ebaecf79f 100644
--- a/crypto/pkcs12/p12_kiss.c
+++ b/crypto/pkcs12/p12_kiss.c
@@ -161,18 +161,18 @@ static int parse_pk12 (PKCS12 *p12, const char *pass, int passlen,
 			bags = M_PKCS12_unpack_p7encdata (p7, pass, passlen);
 		} else continue;
 		if (!bags) {
-			sk_pop_free (asafes, PKCS7_free);
+			sk_pop_free (asafes, (void(*)(void *)) PKCS7_free);
 			return 0;
 		}
 	    	if (!parse_bags(bags, pass, passlen, pkey, cert, ca,
 							 &keyid, &keymatch)) {
-			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;
 		}
-		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);
 	if (keyid) M_ASN1_OCTET_STRING_free(keyid);
 	return 1;
 }
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 */