Commit b4f76582 authored by Ben Laurie's avatar Ben Laurie
Browse files

More evil cast removal.

parent 213a75db

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 


 Changes between 0.9.3a and 0.9.4



  *) Make callbacks for key generation use void * instead of char *.

     [Ben Laurie]



  *) Make S/MIME samples compile (not yet tested).

     [Ben Laurie]

apps/gendh.c

+3 −3
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
#undef PROG

#define PROG gendh_main



static void MS_CALLBACK dh_cb(int p, int n, char *arg);

static void MS_CALLBACK dh_cb(int p, int n, void *arg);

static long dh_load_rand(char *names);

int MAIN(int argc, char **argv)

	{
@@ -164,7 +164,7 @@ bad: 


	BIO_printf(bio_err,"Generating DH parameters, %d bit long strong prime, generator of %d\n",num,g);

	BIO_printf(bio_err,"This is going to take a long time\n");

	dh=DH_generate_parameters(num,g,dh_cb,(char *)bio_err);

	dh=DH_generate_parameters(num,g,dh_cb,bio_err);

		

	if (dh == NULL) goto end;
@@ -184,7 +184,7 @@ end: 
	EXIT(ret);

	}



static void MS_CALLBACK dh_cb(int p, int n, char *arg)

static void MS_CALLBACK dh_cb(int p, int n, void *arg)

	{

	char c='*';

apps/genrsa.c

+3 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
#undef PROG

#define PROG genrsa_main



static void MS_CALLBACK genrsa_cb(int p, int n, char *arg);

static void MS_CALLBACK genrsa_cb(int p, int n, void *arg);

static long gr_load_rand(char *names);

int MAIN(int argc, char **argv)

	{
@@ -194,7 +194,7 @@ bad: 


	BIO_printf(bio_err,"Generating RSA private key, %d bit long modulus\n",

		num);

	rsa=RSA_generate_key(num,f4,genrsa_cb,(char *)bio_err);

	rsa=RSA_generate_key(num,f4,genrsa_cb,bio_err);

		

	if (randfile == NULL)

		BIO_printf(bio_err,"unable to write 'random state'\n");
@@ -227,7 +227,7 @@ err: 
	EXIT(ret);

	}



static void MS_CALLBACK genrsa_cb(int p, int n, char *arg)

static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)

	{

	char c='*';

apps/req.c

+3 −3
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static int add_attribute_object(STACK_OF(X509_ATTRIBUTE) *n, char *text, 
				int max);

static int add_DN_object(X509_NAME *n, char *text, char *def, char *value,

	int nid,int min,int max);

static void MS_CALLBACK req_cb(int p,int n,char *arg);

static void MS_CALLBACK req_cb(int p,int n,void *arg);

static int req_fix_data(int nid,int *type,int len,int min,int max);

static int check_end(char *str, char *end);

static int add_oid_section(LHASH *conf);
@@ -513,7 +513,7 @@ bad: 
			{

			if (!EVP_PKEY_assign_RSA(pkey,

				RSA_generate_key(newkey,0x10001,

					req_cb,(char *)bio_err)))

					req_cb,bio_err)))

				goto end;

			}

		else
@@ -1111,7 +1111,7 @@ err: 
	return(0);

	}



static void MS_CALLBACK req_cb(int p, int n, char *arg)

static void MS_CALLBACK req_cb(int p, int n, void *arg)

	{

	char c='*';

crypto/bn/bn.h

+3 −3
Original line number Diff line number Diff line
@@ -381,9 +381,9 @@ int BN_dec2bn(BIGNUM **a,char *str); 
int	BN_gcd(BIGNUM *r,BIGNUM *in_a,BIGNUM *in_b,BN_CTX *ctx);

BIGNUM *BN_mod_inverse(BIGNUM *ret,BIGNUM *a, BIGNUM *n,BN_CTX *ctx);

BIGNUM *BN_generate_prime(BIGNUM *ret,int bits,int strong,BIGNUM *add,

		BIGNUM *rem,void (*callback)(int,int,char *),char *cb_arg);

int	BN_is_prime(BIGNUM *p,int nchecks,void (*callback)(int,int,char *),

		BN_CTX *ctx,char *cb_arg);

		BIGNUM *rem,void (*callback)(int,int,void *),void *cb_arg);

int	BN_is_prime(BIGNUM *p,int nchecks,void (*callback)(int,int,void *),

		BN_CTX *ctx,void *cb_arg);

void	ERR_load_BN_strings(void );



BN_ULONG bn_mul_add_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w);