From: Richard Levitte <levitte@openssl.org>
Date: Thu, 26 Jun 2003 07:10:10 +0000 (+0000)
Subject: Conform with the standard prototype for engine control functions.
X-Git-Tag: BEN_FIPS_TEST_1~38^2~33
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a99ce1a57481ff7de2971b9c5cc50c2613f4c420;p=oweals%2Fopenssl.git

Conform with the standard prototype for engine control functions.
---

diff --git a/engines/e_4758_cca.c b/engines/e_4758_cca.c
index 68a628229d..ee52a3f66f 100644
--- a/engines/e_4758_cca.c
+++ b/engines/e_4758_cca.c
@@ -76,7 +76,7 @@
 static int ibm_4758_cca_destroy(ENGINE *e);
 static int ibm_4758_cca_init(ENGINE *e);
 static int ibm_4758_cca_finish(ENGINE *e);
-static int ibm_4758_cca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
+static int ibm_4758_cca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
 
 /* rsa functions */
 /*---------------*/
@@ -343,7 +343,7 @@ static int ibm_4758_cca_finish(ENGINE *e)
 	return 1;
 	}
 
-static int ibm_4758_cca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int ibm_4758_cca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
 	{
 	int initialised = ((dso == NULL) ? 0 : 1);
 	switch(cmd)
diff --git a/engines/e_aep.c b/engines/e_aep.c
index 46ccac2823..8e10bb7760 100644
--- a/engines/e_aep.c
+++ b/engines/e_aep.c
@@ -88,7 +88,7 @@ typedef int pid_t;
 
 static int aep_init(ENGINE *e);
 static int aep_finish(ENGINE *e);
-static int aep_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
+static int aep_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
 static int aep_destroy(ENGINE *e);
 
 static AEP_RV aep_get_connection(AEP_CONNECTION_HNDL_PTR hConnection);
@@ -554,7 +554,7 @@ static int aep_finish(ENGINE *e)
 	return to_return;
 	}
 
-static int aep_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int aep_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
 	{
 	int initialised = ((aep_dso == NULL) ? 0 : 1);
 	switch(cmd)
diff --git a/engines/e_atalla.c b/engines/e_atalla.c
index 64dcc046e8..79abc70678 100644
--- a/engines/e_atalla.c
+++ b/engines/e_atalla.c
@@ -78,7 +78,7 @@
 static int atalla_destroy(ENGINE *e);
 static int atalla_init(ENGINE *e);
 static int atalla_finish(ENGINE *e);
-static int atalla_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
+static int atalla_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
 
 /* BIGNUM stuff */
 static int atalla_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
@@ -406,7 +406,7 @@ static int atalla_finish(ENGINE *e)
 	return 1;
 	}
 
-static int atalla_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int atalla_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
 	{
 	int initialised = ((atalla_dso == NULL) ? 0 : 1);
 	switch(cmd)
diff --git a/engines/e_cswift.c b/engines/e_cswift.c
index 28a51d1bfd..793aaccb11 100644
--- a/engines/e_cswift.c
+++ b/engines/e_cswift.c
@@ -92,7 +92,7 @@
 static int cswift_destroy(ENGINE *e);
 static int cswift_init(ENGINE *e);
 static int cswift_finish(ENGINE *e);
-static int cswift_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
+static int cswift_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
 
 /* BIGNUM stuff */
 static int cswift_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
@@ -439,7 +439,7 @@ static int cswift_finish(ENGINE *e)
 	return 1;
 	}
 
-static int cswift_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int cswift_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
 	{
 	int initialised = ((cswift_dso == NULL) ? 0 : 1);
 	switch(cmd)
diff --git a/engines/e_gmp.c b/engines/e_gmp.c
index 8d778fcbf7..64cb039ed8 100644
--- a/engines/e_gmp.c
+++ b/engines/e_gmp.c
@@ -97,7 +97,7 @@
 static int e_gmp_destroy(ENGINE *e);
 static int e_gmp_init(ENGINE *e);
 static int e_gmp_finish(ENGINE *e);
-static int e_gmp_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()); 
+static int e_gmp_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void)); 
 
 #ifndef OPENSSL_NO_RSA
 /* RSA stuff */
@@ -230,7 +230,7 @@ static int e_gmp_finish(ENGINE *e)
 	return 1;
 	}
 
-static int e_gmp_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int e_gmp_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
 	{
 	int to_return = 1;
 
diff --git a/engines/e_ncipher.c b/engines/e_ncipher.c
index bf95ca8612..e416cffedb 100644
--- a/engines/e_ncipher.c
+++ b/engines/e_ncipher.c
@@ -88,7 +88,7 @@
 static int hwcrhk_destroy(ENGINE *e);
 static int hwcrhk_init(ENGINE *e);
 static int hwcrhk_finish(ENGINE *e);
-static int hwcrhk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()); 
+static int hwcrhk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void)); 
 
 /* Functions to handle mutexes */
 static int hwcrhk_mutex_init(HWCryptoHook_Mutex*, HWCryptoHook_CallerContext*);
@@ -648,7 +648,7 @@ static int hwcrhk_finish(ENGINE *e)
 	return to_return;
 	}
 
-static int hwcrhk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int hwcrhk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
 	{
 	int to_return = 1;
 
diff --git a/engines/e_nuron.c b/engines/e_nuron.c
index f9c3795033..e3a9406c49 100644
--- a/engines/e_nuron.c
+++ b/engines/e_nuron.c
@@ -156,7 +156,7 @@ static int nuron_finish(ENGINE *e)
 	return 1;
 	}
 
-static int nuron_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int nuron_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
 	{
 	int initialised = ((pvDSOHandle == NULL) ? 0 : 1);
 	switch(cmd)
diff --git a/engines/e_sureware.c b/engines/e_sureware.c
index cae8bf4856..8e77e5c282 100644
--- a/engines/e_sureware.c
+++ b/engines/e_sureware.c
@@ -69,7 +69,7 @@
 #define SUREWARE_LIB_NAME "sureware engine"
 #include "e_sureware_err.c"
 
-static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
+static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
 static int surewarehk_destroy(ENGINE *e);
 static int surewarehk_init(ENGINE *e);
 static int surewarehk_finish(ENGINE *e);
@@ -368,7 +368,7 @@ static BIO *logstream = NULL;
  * called, the checking and error handling is probably down there. 
 */
 static int threadsafe=1;
-static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
 {
 	int to_return = 1;
 
diff --git a/engines/e_ubsec.c b/engines/e_ubsec.c
index b019714a56..094458887c 100644
--- a/engines/e_ubsec.c
+++ b/engines/e_ubsec.c
@@ -82,7 +82,7 @@
 static int ubsec_destroy(ENGINE *e);
 static int ubsec_init(ENGINE *e);
 static int ubsec_finish(ENGINE *e);
-static int ubsec_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
+static int ubsec_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
 static int ubsec_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 		const BIGNUM *m, BN_CTX *ctx);
 static int ubsec_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
@@ -518,7 +518,7 @@ static int ubsec_finish(ENGINE *e)
 	return 1;
 	}
 
-static int ubsec_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int ubsec_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
 	{
 	int initialised = ((ubsec_dso == NULL) ? 0 : 1);
 	switch(cmd)