X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=engines%2Fe_4758_cca.c;h=b006ed876373b933f0eb0c0ad056cf24773cc9f7;hb=dc90f64d563f2c9709749d0731d6b26c6bce5325;hp=68a628229d65b2a7a9c6f8ad3fad800ed68af51d;hpb=4ebb5293fc7ae1fbb7c5cd8bbe114049bcd8685e;p=oweals%2Fopenssl.git

diff --git a/engines/e_4758_cca.c b/engines/e_4758_cca.c
index 68a628229d..b006ed8763 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)
@@ -390,7 +390,7 @@ static EVP_PKEY *ibm_4758_load_privkey(ENGINE* e, const char* key_id,
 	unsigned char exitData[8];
 	unsigned char ruleArray[8];
 	unsigned char keyLabel[64];
-	long keyLabelLength = strlen(key_id);
+	unsigned long keyLabelLength = strlen(key_id);
 	unsigned char modulus[256];
 	long modulusFieldLength = sizeof(modulus);
 	long modulusLength = 0;
@@ -482,7 +482,7 @@ static EVP_PKEY *ibm_4758_load_pubkey(ENGINE* e, const char* key_id,
 	unsigned char exitData[8];
 	unsigned char ruleArray[8];
 	unsigned char keyLabel[64];
-	long keyLabelLength = strlen(key_id);
+	unsigned long keyLabelLength = strlen(key_id);
 	unsigned char modulus[512];
 	long modulusFieldLength = sizeof(modulus);
 	long modulusLength = 0;
@@ -922,7 +922,7 @@ static int cca_get_random_bytes(unsigned char* buf, int num)
 	unsigned char form[] = "RANDOM  ";
 	unsigned char rand_buf[8];
 
-	while(num >= sizeof(rand_buf))
+	while(num >= (int)sizeof(rand_buf))
 		{
 		randomNumberGenerate(&ret_code, &reason_code, &exit_data_length,
 			exit_data, form, rand_buf);