From 6343829a391df59e46e513c84b6264ee71ad9518 Mon Sep 17 00:00:00 2001 From: Geoff Thorpe Date: Wed, 12 Nov 2008 03:58:08 +0000 Subject: Revert the size_t modifications from HEAD that had led to more knock-on work than expected - they've been extracted into a patch series that can be completed elsewhere, or in a different branch, before merging back to HEAD. --- engines/e_4758cca.c | 4 ++-- engines/e_chil.c | 4 ++-- engines/e_cswift.c | 4 ++-- engines/e_sureware.c | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'engines') diff --git a/engines/e_4758cca.c b/engines/e_4758cca.c index b29b2b8b9b..9f6572e677 100644 --- a/engines/e_4758cca.c +++ b/engines/e_4758cca.c @@ -108,7 +108,7 @@ static int getModulusAndExponent(const unsigned char *token, long *exponentLengt /* RAND number functions */ /*-----------------------*/ -static int cca_get_random_bytes(unsigned char*, size_t); +static int cca_get_random_bytes(unsigned char*, int ); static int cca_random_status(void); #ifndef OPENSSL_NO_RSA @@ -927,7 +927,7 @@ static int cca_random_status(void) return 1; } -static int cca_get_random_bytes(unsigned char* buf, size_t num) +static int cca_get_random_bytes(unsigned char* buf, int num) { long ret_code; long reason_code; diff --git a/engines/e_chil.c b/engines/e_chil.c index dda63ac73b..2d0bbf2683 100644 --- a/engines/e_chil.c +++ b/engines/e_chil.c @@ -127,7 +127,7 @@ static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r, #endif /* RAND stuff */ -static int hwcrhk_rand_bytes(unsigned char *buf, size_t num); +static int hwcrhk_rand_bytes(unsigned char *buf, int num); static int hwcrhk_rand_status(void); /* KM stuff */ @@ -1097,7 +1097,7 @@ static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r, #endif /* Random bytes are good */ -static int hwcrhk_rand_bytes(unsigned char *buf, size_t num) +static int hwcrhk_rand_bytes(unsigned char *buf, int num) { char tempbuf[1024]; HWCryptoHook_ErrMsgBuf rmsg; diff --git a/engines/e_cswift.c b/engines/e_cswift.c index 80d7894eba..bc65179846 100644 --- a/engines/e_cswift.c +++ b/engines/e_cswift.c @@ -141,7 +141,7 @@ static int cswift_mod_exp_dh(const DH *dh, BIGNUM *r, #endif /* RAND stuff */ -static int cswift_rand_bytes(unsigned char *buf, size_t num); +static int cswift_rand_bytes(unsigned char *buf, int num); static int cswift_rand_status(void); /* The definitions for control commands specific to this engine */ @@ -1040,7 +1040,7 @@ static int cswift_mod_exp_dh(const DH *dh, BIGNUM *r, #endif /* Random bytes are good */ -static int cswift_rand_bytes(unsigned char *buf, size_t num) +static int cswift_rand_bytes(unsigned char *buf, int num) { SW_CONTEXT_HANDLE hac; SW_STATUS swrc; diff --git a/engines/e_sureware.c b/engines/e_sureware.c index 34ae6ed505..cd0fa4c397 100644 --- a/engines/e_sureware.c +++ b/engines/e_sureware.c @@ -96,9 +96,9 @@ static int surewarehk_rsa_sign(int flen,const unsigned char *from,unsigned char #endif /* RAND stuff */ -static int surewarehk_rand_bytes(unsigned char *buf, size_t num); -static void surewarehk_rand_seed(const void *buf, size_t num); -static void surewarehk_rand_add(const void *buf, size_t num, double entropy); +static int surewarehk_rand_bytes(unsigned char *buf, int num); +static void surewarehk_rand_seed(const void *buf, int num); +static void surewarehk_rand_add(const void *buf, int num, double entropy); /* KM stuff */ static EVP_PKEY *surewarehk_load_privkey(ENGINE *e, const char *key_id, @@ -613,7 +613,7 @@ static void surewarehk_error_handling(char *const msg,int func,int ret) } } -static int surewarehk_rand_bytes(unsigned char *buf, size_t num) +static int surewarehk_rand_bytes(unsigned char *buf, int num) { int ret=0; char msg[64]="ENGINE_rand_bytes"; @@ -629,7 +629,7 @@ static int surewarehk_rand_bytes(unsigned char *buf, size_t num) return ret==1 ? 1 : 0; } -static void surewarehk_rand_seed(const void *buf, size_t num) +static void surewarehk_rand_seed(const void *buf, int num) { int ret=0; char msg[64]="ENGINE_rand_seed"; @@ -644,7 +644,7 @@ static void surewarehk_rand_seed(const void *buf, size_t num) } } -static void surewarehk_rand_add(const void *buf, size_t num, double entropy) +static void surewarehk_rand_add(const void *buf, int num, double entropy) { surewarehk_rand_seed(buf,num); } -- cgit v1.2.3