Commit 927a28ba authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

gcc 4.2 fixes to avoid use or function pointer casts in OpenSSL. 

Fix various "computed value not used" warnings too.
parent a938c428

CHANGES

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


 Changes between 0.9.8e and 0.9.8f  [xx XXX xxxx]



  *) Changes to avoid need for function casts in OpenSSL: some compilers

     (gcc 4.2 and later) reject their use.NB: safestack not reimplemented yet.

     [Kurt Roeckx <kurt@roeckx.be>, Peter Hartley <pdh@utter.chaos.org.uk>]

  

  *) Add RFC4507 support to OpenSSL. This includes the corrections in

     RFC4507bis. The encrypted ticket format is an encrypted encoded

     SSL_SESSION structure, that way new session features are automatically

apps/pkcs12.c

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ int MAIN(int argc, char **argv) 
					X509_keyid_set1(ucert, NULL, 0);

					X509_alias_set1(ucert, NULL, 0);

					/* Remove from list */

					sk_X509_delete(certs, i);

					(void)sk_X509_delete(certs, i);

					break;

					}

				}

crypto/asn1/asn1.h

+54 −9
Original line number Diff line number Diff line
@@ -322,6 +322,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)
@@ -902,23 +913,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
@@ -927,14 +956,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,ASN1_UTCTIME *a);

int ASN1_GENERALIZEDTIME_print(BIO *fp,ASN1_GENERALIZEDTIME *a);
@@ -977,8 +1018,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/asn1/tasn_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **pval, 
	ASN1_VALUE *ptmpval = NULL;

	if (!pval)

		pval = &ptmpval;

	asn1_tlc_clear(&c);

	c.valid = 0;

	if (ASN1_item_ex_d2i(pval, in, len, it, -1, 0, 0, &c) > 0) 

		return *pval;

	return NULL;
@@ -140,7 +140,7 @@ int ASN1_template_d2i(ASN1_VALUE **pval, 
		const unsigned char **in, long len, const ASN1_TEMPLATE *tt)

	{

	ASN1_TLC c;

	asn1_tlc_clear(&c);

	c.valid = 0;

	return asn1_template_ex_d2i(pval, in, len, tt, 0, &c);

	}

crypto/asn1/tasn_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static int asn1_set_seq_out(STACK_OF(ASN1_VALUE) *sk, unsigned char **out, 
		{

		for (i = 0, tder = derlst; i < sk_ASN1_VALUE_num(sk);

							i++, tder++)

			sk_ASN1_VALUE_set(sk, i, tder->field);

			(void)sk_ASN1_VALUE_set(sk, i, tder->field);

		}

	OPENSSL_free(derlst);

	OPENSSL_free(tmpdat);