Commit 3c07d3a3 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Finish gcc 4.2 changes.

parent 1d1a6465

CHANGES

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


 Changes between 0.9.8f and 0.9.9  [xx XXX xxxx]



  *) Final changes to avoid use of pointer pointer casts in OpenSSL.

     OpenSSL should now compile cleanly on gcc 4.2

     [Peter Hartley <pdh@utter.chaos.org.uk>, Steve Henson]



  *) Update SSL library to use new EVP_PKEY MAC API. Include generic MAC

     support including streaming MAC support: this is required for GOST

     ciphersuite support.

crypto/asn1/asn1.h

+54 −9
Original line number Diff line number Diff line
@@ -329,6 +329,17 @@ typedef struct ASN1_VALUE_st ASN1_VALUE; 
#define I2D_OF(type) int (*)(type *,unsigned char **)

#define I2D_OF_const(type) int (*)(const type *,unsigned char **)



#define CHECKED_D2I_OF(type, d2i) \

    ((d2i_of_void*) (1 ? d2i : ((D2I_OF(type))0)))

#define CHECKED_I2D_OF(type, i2d) \

    ((i2d_of_void*) (1 ? i2d : ((I2D_OF(type))0)))

#define CHECKED_NEW_OF(type, xnew) \

    ((void *(*)(void)) (1 ? xnew : ((type *(*)(void))0)))

#define CHECKED_PTR_OF(type, p) \

    ((void*) (1 ? p : (type*)0))

#define CHECKED_PPTR_OF(type, p) \

    ((void**) (1 ? p : (type**)0))



#define TYPEDEF_D2I_OF(type) typedef type *d2i_of_##type(type **,const unsigned char **,long)

#define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(type *,unsigned char **)

#define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type)
@@ -914,23 +925,41 @@ int ASN1_object_size(int constructed, int length, int tag); 


/* Used to implement other functions */

void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x);



#define ASN1_dup_of(type,i2d,d2i,x) \

	((type *(*)(I2D_OF(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)

    ((type*)ASN1_dup(CHECKED_I2D_OF(type, i2d), \

		     CHECKED_D2I_OF(type, d2i), \

		     CHECKED_PTR_OF(type, x)))



#define ASN1_dup_of_const(type,i2d,d2i,x) \

	((type *(*)(I2D_OF_const(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)

    ((type*)ASN1_dup(CHECKED_I2D_OF(const type, i2d), \

		     CHECKED_D2I_OF(type, d2i), \

		     CHECKED_PTR_OF(const type, x)))



void *ASN1_item_dup(const ASN1_ITEM *it, void *x);



#ifndef OPENSSL_NO_FP_API

void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);



#define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \

	((type *(*)(type *(*)(void),D2I_OF(type),FILE *,type **))openssl_fcast(ASN1_d2i_fp))(xnew,d2i,in,x)

    ((type*)ASN1_d2i_fp(CHECKED_NEW_OF(type, xnew), \

			CHECKED_D2I_OF(type, d2i), \

			in, \

			CHECKED_PPTR_OF(type, x)))



void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);

int ASN1_i2d_fp(i2d_of_void *i2d,FILE *out,void *x);



#define ASN1_i2d_fp_of(type,i2d,out,x) \

	((int (*)(I2D_OF(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)

    (ASN1_i2d_fp(CHECKED_I2D_OF(type, i2d), \

		 out, \

		 CHECKED_PTR_OF(type, x)))



#define ASN1_i2d_fp_of_const(type,i2d,out,x) \

	((int (*)(I2D_OF_const(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)

    (ASN1_i2d_fp(CHECKED_I2D_OF(const type, i2d), \

		 out, \

		 CHECKED_PTR_OF(const type, x)))



int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x);

int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags);

#endif
@@ -939,14 +968,26 @@ int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in); 


#ifndef OPENSSL_NO_BIO

void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);



#define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \

	((type *(*)(type *(*)(void),D2I_OF(type),BIO *,type **))openssl_fcast(ASN1_d2i_bio))(xnew,d2i,in,x)

    ((type*)ASN1_d2i_bio( CHECKED_NEW_OF(type, xnew), \

			  CHECKED_D2I_OF(type, d2i), \

			  in, \

			  CHECKED_PPTR_OF(type, x)))



void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);

int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x);



#define ASN1_i2d_bio_of(type,i2d,out,x) \

	((int (*)(I2D_OF(type),BIO *,type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)

    (ASN1_i2d_bio(CHECKED_I2D_OF(type, i2d), \

		  out, \

		  CHECKED_PTR_OF(type, x)))



#define ASN1_i2d_bio_of_const(type,i2d,out,x) \

	((int (*)(I2D_OF_const(type),BIO *,const type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)

    (ASN1_i2d_bio(CHECKED_I2D_OF(const type, i2d), \

		  out, \

		  CHECKED_PTR_OF(const type, x)))



int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);

int ASN1_UTCTIME_print(BIO *fp, const ASN1_UTCTIME *a);

int ASN1_GENERALIZEDTIME_print(BIO *fp, const ASN1_GENERALIZEDTIME *a);
@@ -983,8 +1024,12 @@ void *ASN1_unpack_string(ASN1_STRING *oct, d2i_of_void *d2i); 
void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it);

ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,

			      ASN1_OCTET_STRING **oct);



#define ASN1_pack_string_of(type,obj,i2d,oct) \

	((ASN1_STRING *(*)(type *,I2D_OF(type),ASN1_OCTET_STRING **))openssl_fcast(ASN1_pack_string))(obj,i2d,oct)

    (ASN1_pack_string(CHECKED_PTR_OF(type, obj), \

		      CHECKED_I2D_OF(type, i2d), \

		      oct))



ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct);



void ASN1_STRING_set_default_mask(unsigned long mask);

crypto/ocsp/ocsp.h

+0 −5
Original line number Diff line number Diff line
@@ -471,11 +471,6 @@ int OCSP_basic_sign(OCSP_BASICRESP *brsp, 
			X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,

			STACK_OF(X509) *certs, unsigned long flags);



ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,

				void *data, STACK_OF(ASN1_OBJECT) *sk);

#define ASN1_STRING_encode_of(type,s,i2d,data,sk) \

((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))openssl_fcast(ASN1_STRING_encode))(s,i2d,data,sk)



X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);



X509_EXTENSION *OCSP_accept_responses_new(char **oids);

crypto/ocsp/ocsp_ext.c

+2 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ int OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc) 
	}



/* also CRL Entry Extensions */



#if 0

ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,

				void *data, STACK_OF(ASN1_OBJECT) *sk)

        {
@@ -305,6 +305,7 @@ err: 
	if (b) OPENSSL_free(b);

	return NULL;

	}

#endif



/* Nonce handling functions */

crypto/pem/pem.h

+0 −4
Original line number Diff line number Diff line
@@ -414,13 +414,9 @@ int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm, const char 
	     pem_password_cb *cb, void *u);

void *	PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp,

			  void **x, pem_password_cb *cb, void *u);

#define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \

((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i,name,bp,x,cb,u)

int	PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp, void *x,

			   const EVP_CIPHER *enc,unsigned char *kstr,int klen,

			   pem_password_cb *cb, void *u);

#define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \

	((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))openssl_fcast(PEM_ASN1_write_bio))(i2d,name,bp,x,enc,kstr,klen,cb,u)



STACK_OF(X509_INFO) *	PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u);

int	PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc,