Introduce and use function typedef pem_password_cb so that we don't call

those functions without having a parameter list declaration.
(There are various similar cases left ...)

1 files changed, 28 insertions, 28 deletions

diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c
index 740f6b5722..0775155fb0 100644
--- a/crypto/pem/pem_all.c
+++ b/crypto/pem/pem_all.c
@@ -67,14 +67,14 @@
 
 #ifndef NO_FP_API
 /* The X509 functions */
-X509 *PEM_read_X509(FILE *fp, X509 **x, int (*cb)())
+X509 *PEM_read_X509(FILE *fp, X509 **x, pem_password_cb *cb)
 	{
 	return((X509 *)PEM_ASN1_read((char *(*)())d2i_X509,
 		PEM_STRING_X509,fp,(char **)x,cb));
 	}
 #endif
 
-X509 *PEM_read_bio_X509(BIO *bp, X509 **x, int (*cb)())
+X509 *PEM_read_bio_X509(BIO *bp, X509 **x, pem_password_cb *cb)
 	{
 	return((X509 *)PEM_ASN1_read_bio((char *(*)())d2i_X509,
 		PEM_STRING_X509,bp,(char **)x,cb));
@@ -96,14 +96,14 @@ int PEM_write_bio_X509(BIO *bp, X509 *x)
 
 #ifndef NO_FP_API
 /* The X509_REQ functions */
-X509_REQ *PEM_read_X509_REQ(FILE *fp, X509_REQ **x, int (*cb)())
+X509_REQ *PEM_read_X509_REQ(FILE *fp, X509_REQ **x, pem_password_cb *cb)
 	{
 	return((X509_REQ *)PEM_ASN1_read((char *(*)())d2i_X509_REQ,
 		PEM_STRING_X509_REQ,fp,(char **)x,cb));
 	}
 #endif
 
-X509_REQ *PEM_read_bio_X509_REQ(BIO *bp, X509_REQ **x, int (*cb)())
+X509_REQ *PEM_read_bio_X509_REQ(BIO *bp, X509_REQ **x, pem_password_cb *cb)
 	{
 	return((X509_REQ *)PEM_ASN1_read_bio((char *(*)())d2i_X509_REQ,
 		PEM_STRING_X509_REQ,bp,(char **)x,cb));
@@ -125,14 +125,14 @@ int PEM_write_bio_X509_REQ(BIO *bp, X509_REQ *x)
 
 #ifndef NO_FP_API
 /* The X509_CRL functions */
-X509_CRL *PEM_read_X509_CRL(FILE *fp, X509_CRL **x, int (*cb)())
+X509_CRL *PEM_read_X509_CRL(FILE *fp, X509_CRL **x, pem_password_cb *cb)
 	{
 	return((X509_CRL *)PEM_ASN1_read((char *(*)())d2i_X509_CRL,
 		PEM_STRING_X509_CRL,fp,(char **)x,cb));
 	}
 #endif
 
-X509_CRL *PEM_read_bio_X509_CRL(BIO *bp, X509_CRL **x, int (*cb)())
+X509_CRL *PEM_read_bio_X509_CRL(BIO *bp, X509_CRL **x, pem_password_cb *cb)
 	{
 	return((X509_CRL *)PEM_ASN1_read_bio((char *(*)())d2i_X509_CRL,
 		PEM_STRING_X509_CRL,bp,(char **)x,cb));
@@ -155,26 +155,26 @@ int PEM_write_bio_X509_CRL(BIO *bp, X509_CRL *x)
 #ifndef NO_RSA
 #ifndef NO_FP_API
 /* The RSAPrivateKey functions */
-RSA *PEM_read_RSAPrivateKey(FILE *fp, RSA **x, int (*cb)())
+RSA *PEM_read_RSAPrivateKey(FILE *fp, RSA **x, pem_password_cb *cb)
 	{
 	return((RSA *)PEM_ASN1_read((char *(*)())d2i_RSAPrivateKey,
 		PEM_STRING_RSA,fp,(char **)x,cb));
 	}
 
-RSA *PEM_read_RSAPublicKey(FILE *fp, RSA **x, int (*cb)())
+RSA *PEM_read_RSAPublicKey(FILE *fp, RSA **x, pem_password_cb *cb)
 	{
 	return((RSA *)PEM_ASN1_read((char *(*)())d2i_RSAPublicKey,
 		PEM_STRING_RSA_PUBLIC,fp,(char **)x,cb));
 	}
 #endif
 
-RSA *PEM_read_bio_RSAPrivateKey(BIO *bp, RSA **x, int (*cb)())
+RSA *PEM_read_bio_RSAPrivateKey(BIO *bp, RSA **x, pem_password_cb *cb)
 	{
 	return((RSA *)PEM_ASN1_read_bio((char *(*)())d2i_RSAPrivateKey,
 		PEM_STRING_RSA,bp,(char **)x,cb));
 	}
 
-RSA *PEM_read_bio_RSAPublicKey(BIO *bp, RSA **x, int (*cb)())
+RSA *PEM_read_bio_RSAPublicKey(BIO *bp, RSA **x, pem_password_cb *cb)
 	{
 	return((RSA *)PEM_ASN1_read_bio((char *(*)())d2i_RSAPublicKey,
 		PEM_STRING_RSA_PUBLIC,bp,(char **)x,cb));
@@ -182,7 +182,7 @@ RSA *PEM_read_bio_RSAPublicKey(BIO *bp, RSA **x, int (*cb)())
 
 #ifndef NO_FP_API
 int PEM_write_RSAPrivateKey(FILE *fp, RSA *x, EVP_CIPHER *enc,
-	     unsigned char *kstr, int klen, int (*cb)())
+	     unsigned char *kstr, int klen, pem_password_cb *cb)
 	{
 	return(PEM_ASN1_write((int (*)())i2d_RSAPrivateKey,PEM_STRING_RSA,fp,
 		(char *)x,enc,kstr,klen,cb));
@@ -197,7 +197,7 @@ int PEM_write_RSAPublicKey(FILE *fp, RSA *x)
 #endif
 
 int PEM_write_bio_RSAPrivateKey(BIO *bp, RSA *x, const EVP_CIPHER *enc,
-	     unsigned char *kstr, int klen, int (*cb)())
+	     unsigned char *kstr, int klen, pem_password_cb *cb)
 	{
 	return(PEM_ASN1_write_bio((int (*)())i2d_RSAPrivateKey,PEM_STRING_RSA,
 		bp,(char *)x,enc,kstr,klen,cb));
@@ -214,14 +214,14 @@ int PEM_write_bio_RSAPublicKey(BIO *bp, RSA *x)
 #ifndef NO_DSA
 #ifndef NO_FP_API
 /* The DSAPrivateKey functions */
-DSA *PEM_read_DSAPrivateKey(FILE *fp, DSA **x, int (*cb)())
+DSA *PEM_read_DSAPrivateKey(FILE *fp, DSA **x, pem_password_cb *cb)
 	{
 	return((DSA *)PEM_ASN1_read((char *(*)())d2i_DSAPrivateKey,
 		PEM_STRING_DSA,fp,(char **)x,cb));
 	}
 #endif
 
-DSA *PEM_read_bio_DSAPrivateKey(BIO *bp, DSA **x, int (*cb)())
+DSA *PEM_read_bio_DSAPrivateKey(BIO *bp, DSA **x, pem_password_cb *cb)
 	{
 	return((DSA *)PEM_ASN1_read_bio((char *(*)())d2i_DSAPrivateKey,
 		PEM_STRING_DSA,bp,(char **)x,cb));
@@ -229,7 +229,7 @@ DSA *PEM_read_bio_DSAPrivateKey(BIO *bp, DSA **x, int (*cb)())
 
 #ifndef NO_FP_API
 int PEM_write_DSAPrivateKey(FILE *fp, DSA *x, const EVP_CIPHER *enc,
-	     unsigned char *kstr, int klen, int (*cb)())
+	     unsigned char *kstr, int klen, pem_password_cb *cb)
 	{
 	return(PEM_ASN1_write((int (*)())i2d_DSAPrivateKey,PEM_STRING_DSA,fp,
 		(char *)x,enc,kstr,klen,cb));
@@ -237,7 +237,7 @@ int PEM_write_DSAPrivateKey(FILE *fp, DSA *x, const EVP_CIPHER *enc,
 #endif
 
 int PEM_write_bio_DSAPrivateKey(BIO *bp, DSA *x, const EVP_CIPHER *enc,
-	     unsigned char *kstr, int klen, int (*cb)())
+	     unsigned char *kstr, int klen, pem_password_cb *cb)
 	{
 	return(PEM_ASN1_write_bio((int (*)())i2d_DSAPrivateKey,PEM_STRING_DSA,
 		bp,(char *)x,enc,kstr,klen,cb));
@@ -246,14 +246,14 @@ int PEM_write_bio_DSAPrivateKey(BIO *bp, DSA *x, const EVP_CIPHER *enc,
 
 #ifndef NO_FP_API
 /* The PrivateKey functions */
-EVP_PKEY *PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, int (*cb)())
+EVP_PKEY *PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb)
 	{
 	return((EVP_PKEY *)PEM_ASN1_read((char *(*)())d2i_PrivateKey,
 		PEM_STRING_EVP_PKEY,fp,(char **)x,cb));
 	}
 #endif
 
-EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, int (*cb)())
+EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb)
 	{
 	return((EVP_PKEY *)PEM_ASN1_read_bio((char *(*)())d2i_PrivateKey,
 		PEM_STRING_EVP_PKEY,bp,(char **)x,cb));
@@ -261,7 +261,7 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, int (*cb)())
 
 #ifndef NO_FP_API
 int PEM_write_PrivateKey(FILE *fp, EVP_PKEY *x, EVP_CIPHER *enc,
-	     unsigned char *kstr, int klen, int (*cb)())
+	     unsigned char *kstr, int klen, pem_password_cb *cb)
 	{
 	return(PEM_ASN1_write((int (*)())i2d_PrivateKey,
 		((x->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA),
@@ -270,7 +270,7 @@ int PEM_write_PrivateKey(FILE *fp, EVP_PKEY *x, EVP_CIPHER *enc,
 #endif
 
 int PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, EVP_CIPHER *enc,
-	     unsigned char *kstr, int klen, int (*cb)())
+	     unsigned char *kstr, int klen, pem_password_cb *cb)
 	{
 	return(PEM_ASN1_write_bio((int (*)())i2d_PrivateKey,
 		((x->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA),
@@ -279,14 +279,14 @@ int PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, EVP_CIPHER *enc,
 
 #ifndef NO_FP_API
 /* The PKCS7 functions */
-PKCS7 *PEM_read_PKCS7(FILE *fp, PKCS7 **x, int (*cb)())
+PKCS7 *PEM_read_PKCS7(FILE *fp, PKCS7 **x, pem_password_cb *cb)
 	{
 	return((PKCS7 *)PEM_ASN1_read((char *(*)())d2i_PKCS7,
 		PEM_STRING_PKCS7,fp,(char **)x,cb));
 	}
 #endif
 
-PKCS7 *PEM_read_bio_PKCS7(BIO *bp, PKCS7 **x, int (*cb)())
+PKCS7 *PEM_read_bio_PKCS7(BIO *bp, PKCS7 **x, pem_password_cb *cb)
 	{
 	return((PKCS7 *)PEM_ASN1_read_bio((char *(*)())d2i_PKCS7,
 		PEM_STRING_PKCS7,bp,(char **)x,cb));
@@ -309,14 +309,14 @@ int PEM_write_bio_PKCS7(BIO *bp, PKCS7 *x)
 #ifndef NO_DH
 #ifndef NO_FP_API
 /* The DHparams functions */
-DH *PEM_read_DHparams(FILE *fp, DH **x, int (*cb)())
+DH *PEM_read_DHparams(FILE *fp, DH **x, pem_password_cb *cb)
 	{
 	return((DH *)PEM_ASN1_read((char *(*)())d2i_DHparams,
 		PEM_STRING_DHPARAMS,fp,(char **)x,cb));
 	}
 #endif
 
-DH *PEM_read_bio_DHparams(BIO *bp, DH **x, int (*cb)())
+DH *PEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb)
 	{
 	return((DH *)PEM_ASN1_read_bio((char *(*)())d2i_DHparams,
 		PEM_STRING_DHPARAMS,bp,(char **)x,cb));
@@ -340,14 +340,14 @@ int PEM_write_bio_DHparams(BIO *bp, DH *x)
 #ifndef NO_DSA
 #ifndef NO_FP_API
 /* The DSAparams functions */
-DSA *PEM_read_DSAparams(FILE *fp, DSA **x, int (*cb)())
+DSA *PEM_read_DSAparams(FILE *fp, DSA **x, pem_password_cb *cb)
 	{
 	return((DSA *)PEM_ASN1_read((char *(*)())d2i_DSAparams,
 		PEM_STRING_DSAPARAMS,fp,(char **)x,cb));
 	}
 #endif
 
-DSA *PEM_read_bio_DSAparams(BIO *bp, DSA **x, int (*cb)())
+DSA *PEM_read_bio_DSAparams(BIO *bp, DSA **x, pem_password_cb *cb)
 	{
 	return((DSA *)PEM_ASN1_read_bio((char *(*)())d2i_DSAparams,
 		PEM_STRING_DSAPARAMS,bp,(char **)x,cb));
@@ -372,7 +372,7 @@ int PEM_write_bio_DSAparams(BIO *bp, DSA *x)
 
 #ifndef NO_FP_API
 NETSCAPE_CERT_SEQUENCE *PEM_read_NETSCAPE_CERT_SEQUENCE(FILE *fp,
-	     NETSCAPE_CERT_SEQUENCE **x, int (*cb)())
+	     NETSCAPE_CERT_SEQUENCE **x, pem_password_cb *cb)
 	{
 	return((NETSCAPE_CERT_SEQUENCE *)
 		PEM_ASN1_read((char *(*)())d2i_NETSCAPE_CERT_SEQUENCE,
@@ -381,7 +381,7 @@ NETSCAPE_CERT_SEQUENCE *PEM_read_NETSCAPE_CERT_SEQUENCE(FILE *fp,
 #endif
 
 NETSCAPE_CERT_SEQUENCE *PEM_read_bio_NETSCAPE_CERT_SEQUENCE(BIO *bp,
-	     NETSCAPE_CERT_SEQUENCE **x, int (*cb)())
+	     NETSCAPE_CERT_SEQUENCE **x, pem_password_cb *cb)
 	{
 	return((NETSCAPE_CERT_SEQUENCE *)
 		PEM_ASN1_read_bio((char *(*)())d2i_NETSCAPE_CERT_SEQUENCE,