Commit 0e1c0612 authored by Ulf Möller's avatar Ulf Möller
Browse files

Get rid of more non-ANSI declarations.

parent 0c109ea2

CHANGES

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


 Changes between 0.9.5a and 0.9.6  [xx XXX 2000]



  *) Eliminate non-ANSI declarations in crypto.h and stack.h.

	 [Ulf Möller]



  *) Fix for SSL server purpose checking. Server checking was

     rejecting certificates which had extended key usage present

     but no ssl client purpose.

apps/ca.c

+1 −1
Original line number Diff line number Diff line
@@ -1233,7 +1233,7 @@ err: 
	BIO_free(out);

	BIO_free(in);



	sk_pop_free(cert_sk,X509_free);

	sk_pop_free(cert_sk, (void(*)(void *)) X509_free);



	if (ret) ERR_print_errors(bio_err);

	app_RAND_write_file(randfile, bio_err);

apps/pkcs12.c

+6 −6
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ int MAIN(int argc, char **argv) 
	/* Turn certbags into encrypted authsafe */

	authsafe = PKCS12_pack_p7encdata(cert_pbe, cpass, -1, NULL, 0,

								 iter, bags);

	sk_pop_free(bags, PKCS12_SAFEBAG_free);

	sk_pop_free(bags, (void(*)(void *)) PKCS12_SAFEBAG_free);



	if (!authsafe) {

		ERR_print_errors (bio_err);
@@ -481,14 +481,14 @@ int MAIN(int argc, char **argv) 
	sk_push (bags, (char *)bag);

	/* Turn it into unencrypted safe bag */

	authsafe = PKCS12_pack_p7data (bags);

	sk_pop_free(bags, PKCS12_SAFEBAG_free);

	sk_pop_free(bags, (void(*)(void *)) PKCS12_SAFEBAG_free);

	sk_push (safes, (char *)authsafe);



	p12 = PKCS12_init (NID_pkcs7_data);



	M_PKCS12_pack_authsafes (p12, safes);



	sk_pop_free(safes, PKCS7_free);

	sk_pop_free(safes, (void(*)(void *)) PKCS7_free);



	PKCS12_set_mac (p12, mpass, -1, NULL, 0, maciter, NULL);
@@ -592,12 +592,12 @@ int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass, 
		if (!bags) return 0;

	    	if (!dump_certs_pkeys_bags (out, bags, pass, passlen, 

						 options, pempass)) {

			sk_pop_free (bags, PKCS12_SAFEBAG_free);

			sk_pop_free (bags, (void(*)(void *)) PKCS12_SAFEBAG_free);

			return 0;

		}

		sk_pop_free (bags, PKCS12_SAFEBAG_free);

		sk_pop_free (bags, (void(*)(void *)) PKCS12_SAFEBAG_free);

	}

	sk_pop_free (asafes, PKCS7_free);

	sk_pop_free (asafes, (void(*)(void *)) PKCS7_free);

	return 1;

}

crypto/bio/bf_buff.c

+9 −9
Original line number Diff line number Diff line
@@ -62,11 +62,11 @@ 
#include <openssl/bio.h>

#include <openssl/evp.h>



static int buffer_write(BIO *h,char *buf,int num);

static int buffer_write(BIO *h, const char *buf,int num);

static int buffer_read(BIO *h, char *buf, int size);

static int buffer_puts(BIO *h,char *str);

static int buffer_puts(BIO *h, const char *str);

static int buffer_gets(BIO *h, char *str, int size);

static long buffer_ctrl(BIO *h,int cmd,long arg1,char *arg2);

static long buffer_ctrl(BIO *h, int cmd, long arg1, void *arg2);

static int buffer_new(BIO *h);

static int buffer_free(BIO *data);

static long buffer_callback_ctrl(BIO *h, int cmd, void (*fp)());
@@ -195,7 +195,7 @@ start: 
	goto start;

	}



static int buffer_write(BIO *b, char *in, int inl)

static int buffer_write(BIO *b, const char *in, int inl)

	{

	int i,num=0;

	BIO_F_BUFFER_CTX *ctx;
@@ -268,7 +268,7 @@ start: 
	goto start;

	}



static long buffer_ctrl(BIO *b, int cmd, long num, char *ptr)

static long buffer_ctrl(BIO *b, int cmd, long num, void *ptr)

	{

	BIO *dbio;

	BIO_F_BUFFER_CTX *ctx;
@@ -504,7 +504,7 @@ static int buffer_gets(BIO *b, char *buf, int size) 
		}

	}



static int buffer_puts(BIO *b, char *str)

static int buffer_puts(BIO *b, const char *str)

	{

	return(BIO_write(b,str,strlen(str)));

	}

crypto/bio/bf_nbio.c

+6 −6
Original line number Diff line number Diff line
@@ -66,11 +66,11 @@ 
/* BIO_put and BIO_get both add to the digest,

 * BIO_gets returns the digest */



static int nbiof_write(BIO *h,char *buf,int num);

static int nbiof_write(BIO *h,const char *buf,int num);

static int nbiof_read(BIO *h,char *buf,int size);

static int nbiof_puts(BIO *h,char *str);

static int nbiof_puts(BIO *h,const char *str);

static int nbiof_gets(BIO *h,char *str,int size);

static long nbiof_ctrl(BIO *h,int cmd,long arg1,char *arg2);

static long nbiof_ctrl(BIO *h,int cmd,long arg1,void *arg2);

static int nbiof_new(BIO *h);

static int nbiof_free(BIO *data);

static long nbiof_callback_ctrl(BIO *h,int cmd,void (*fp)());
@@ -159,7 +159,7 @@ static int nbiof_read(BIO *b, char *out, int outl) 
	return(ret);

	}



static int nbiof_write(BIO *b, char *in, int inl)

static int nbiof_write(BIO *b, const char *in, int inl)

	{

	NBIO_TEST *nt;

	int ret=0;
@@ -204,7 +204,7 @@ static int nbiof_write(BIO *b, char *in, int inl) 
	return(ret);

	}



static long nbiof_ctrl(BIO *b, int cmd, long num, char *ptr)

static long nbiof_ctrl(BIO *b, int cmd, long num, void *ptr)

	{

	long ret;
@@ -247,7 +247,7 @@ static int nbiof_gets(BIO *bp, char *buf, int size) 
	}





static int nbiof_puts(BIO *bp, char *str)

static int nbiof_puts(BIO *bp, const char *str)

	{

	if (bp->next_bio == NULL) return(0);

	return(BIO_puts(bp->next_bio,str));