Attachment #119315 for bug #158324





/* Used to implement other functions */
void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x);
extern const void *__ASN1_dup;
#define ASN1_dup_of(type,i2d,d2i,x) \
	((type *(*)(I2D_OF(type),D2I_OF(type),type *))__ASN1_dup)(i2d,d2i,x)
#define ASN1_dup_of_const(type,i2d,d2i,x) \
	((type *(*)(I2D_OF_const(type),D2I_OF(type),type *))__ASN1_dup)(i2d,d2i,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);
extern const void *__ASN1_d2i_fp;
#define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
	((type *(*)(type *(*)(void),D2I_OF(type),FILE *,type **))__ASN1_d2i_fp)(xnew,d2i,in,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);
extern const void *__ASN1_i2d_fp;
#define ASN1_i2d_fp_of(type,i2d,out,x) \
	((int (*)(I2D_OF(type),FILE *,type *))__ASN1_i2d_fp)(i2d,out,x)
#define ASN1_i2d_fp_of_const(type,i2d,out,x) \
	((int (*)(I2D_OF_const(type),FILE *,type *))__ASN1_i2d_fp)(i2d,out,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


#ifndef OPENSSL_NO_BIO
void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);
extern const void *__ASN1_d2i_bio;
#define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
	((type *(*)(type *(*)(void),D2I_OF(type),BIO *,type **))__ASN1_d2i_bio)(xnew,d2i,in,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);
extern const void *__ASN1_i2d_bio;
#define ASN1_i2d_bio_of(type,i2d,out,x) \
	((int (*)(I2D_OF(type),BIO *,type *))__ASN1_i2d_bio)(i2d,out,x)
#define ASN1_i2d_bio_of_const(type,i2d,out,x) \
	((int (*)(I2D_OF_const(type),BIO *,const type *))__ASN1_i2d_bio)(i2d,out,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);

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);
extern const void *__ASN1_pack_string;
#define ASN1_pack_string_of(type,obj,i2d,oct) \
	((ASN1_STRING *(*)(type *,I2D_OF(type),ASN1_OCTET_STRING **))__ASN1_pack_string)(obj,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);

Lines 468-475 Link Here

(-)openssl-0.9.8e/crypto/ocsp/ocsp.h.gcc42~ (-1 / +2 lines)
468		468
469	ASN1_STRING ASN1_STRING_encode(ASN1_STRING s, i2d_of_void *i2d,	469	ASN1_STRING ASN1_STRING_encode(ASN1_STRING s, i2d_of_void *i2d,
470	void data, STACK_OF(ASN1_OBJECT) sk);	470	void data, STACK_OF(ASN1_OBJECT) sk);
		471	extern const void *__ASN1_STRING_encode;
471	#define ASN1_STRING_encode_of(type,s,i2d,data,sk) \	472	#define ASN1_STRING_encode_of(type,s,i2d,data,sk) \
472	((ASN1_STRING ()(ASN1_STRING ,I2D_OF(type),type ,STACK_OF(ASN1_OBJECT) *))openssl_fcast(ASN1_STRING_encode))(s,i2d,data,sk)	473	((ASN1_STRING ()(ASN1_STRING ,I2D_OF(type),type ,STACK_OF(ASN1_OBJECT) *))__ASN1_STRING_encode)(s,i2d,data,sk)
473		474
474	X509_EXTENSION OCSP_crlID_new(char url, long n, char tim);	475	X509_EXTENSION OCSP_crlID_new(char url, long n, char tim);
475		476




#define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
{ \
return(((type *(*)(D2I_OF(type),char *,FILE *,type **,pem_password_cb *,void *))__PEM_ASN1_read)(d2i_##asn1, str,fp,x,cb,u)); \
} 

#define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
int PEM_write_##name(FILE *fp, type *x) \
{ \
return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))__PEM_ASN1_write)(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
}

#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
int PEM_write_##name(FILE *fp, const type *x) \
{ \
return(((int (*)(I2D_OF_const(type),const char *,FILE *, const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))__PEM_ASN1_write)(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
}

#define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \

	     unsigned char *kstr, int klen, pem_password_cb *cb, \
		  void *u) \
	{ \
	return(((int (*)(I2D_OF(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))__PEM_ASN1_write)(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
	}

#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \

	     unsigned char *kstr, int klen, pem_password_cb *cb, \
		  void *u) \
	{ \
	return(((int (*)(I2D_OF_const(type),const char *,FILE *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))__PEM_ASN1_write)(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
	}

#endif

#define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
{ \
return(((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))__PEM_ASN1_read_bio)(d2i_##asn1, str,bp,x,cb,u)); \
}

#define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
int PEM_write_bio_##name(BIO *bp, type *x) \
{ \
return(((int (*)(I2D_OF(type),const char *,BIO *,type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))__PEM_ASN1_write_bio)(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \
}

#define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
int PEM_write_bio_##name(BIO *bp, const type *x) \
{ \
return(((int (*)(I2D_OF_const(type),const char *,BIO *,const type *, const EVP_CIPHER *,unsigned char *,int, pem_password_cb *,void *))__PEM_ASN1_write_bio)(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \
}

#define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
	{ \
	return(((int (*)(I2D_OF(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))__PEM_ASN1_write_bio)(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \
	}

#define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
	{ \
	return(((int (*)(I2D_OF_const(type),const char *,BIO *,type *,const EVP_CIPHER *,unsigned char *,int,pem_password_cb *,void *))__PEM_ASN1_write_bio)(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \
	}

#define IMPLEMENT_PEM_write(name, type, str, asn1) \

	     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);
extern const void *__PEM_ASN1_read_bio;
#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 *))__PEM_ASN1_read_bio)(d2i,name,bp,x,cb,u)
int	PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp,char *x,
			   const EVP_CIPHER *enc,unsigned char *kstr,int klen,
			   pem_password_cb *cb, void *u);
extern const void *__PEM_ASN1_write_bio;
#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 *))__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,

int	PEM_write(FILE *fp,char *name,char *hdr,unsigned char *data,long len);
void *  PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
		      pem_password_cb *cb, void *u);
extern const void *__PEM_ASN1_read;
int	PEM_ASN1_write(i2d_of_void *i2d,const char *name,FILE *fp,
		       char *x,const EVP_CIPHER *enc,unsigned char *kstr,
		       int klen,pem_password_cb *callback, void *u);
STACK_OF(X509_INFO) *	PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,
	pem_password_cb *cb, void *u);
extern const void *__PEM_ASN1_write;
#endif

int	PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type,

Lines 81-86 Link Here

(-)openssl-0.9.8e/crypto/asn1/a_d2i_fp.c.ark (+2 lines)
81	BIO_free(b);	81	BIO_free(b);
82	return(ret);	82	return(ret);
83	}	83	}
		84	const void * __attribute__((unused)) __ASN1_d2i_fp=(const void*)openssl_fcast(ASN1_d2i_fp);
84	#endif	85	#endif
85		86
86	void ASN1_d2i_bio(void (xnew)(void), d2i_of_void d2i, BIO in, void *x)	87	void ASN1_d2i_bio(void (xnew)(void), d2i_of_void d2i, BIO in, void *x)
Lines 99-104 Link Here
99	if (b != NULL) BUF_MEM_free(b);	100	if (b != NULL) BUF_MEM_free(b);
100	return(ret);	101	return(ret);
101	}	102	}
		103	const void * __attribute__((unused)) __ASN1_d2i_bio=(const void*)openssl_fcast(ASN1_d2i_bio);
102		104
103	#endif	105	#endif
104		106

Lines 82-87 Link Here

(-)openssl-0.9.8e/crypto/asn1/a_dup.c.ark (+1 lines)
82	OPENSSL_free(b);	82	OPENSSL_free(b);
83	return(ret);	83	return(ret);
84	}	84	}
		85	const void * __attribute__((unused)) __ASN1_dup=(const void*)openssl_fcast(ASN1_dup);
85		86
86	#endif	87	#endif
87		88

Lines 79-84 Link Here

(-)openssl-0.9.8e/crypto/asn1/a_i2d_fp.c.ark (+2 lines)
79	BIO_free(b);	79	BIO_free(b);
80	return(ret);	80	return(ret);
81	}	81	}
		82	const void * __attribute__((unused)) __ASN1_i2d_fp=(const void*)openssl_fcast(ASN1_i2d_fp);
82	#endif	83	#endif
83		84
84	int ASN1_i2d_bio(i2d_of_void i2d, BIO out, unsigned char *x)	85	int ASN1_i2d_bio(i2d_of_void i2d, BIO out, unsigned char *x)
Lines 113-118 Link Here
113	OPENSSL_free(b);	114	OPENSSL_free(b);
114	return(ret);	115	return(ret);
115	}	116	}
		117	const void * __attribute__((unused)) __ASN1_i2d_bio=(const void*)openssl_fcast(ASN1_i2d_bio);
116		118
117	#endif	119	#endif
118		120

Lines 144-149 Link Here

(-)openssl-0.9.8e/crypto/asn1/asn_pack.c.ark (+1 lines)
144	i2d (obj, &p);	144	i2d (obj, &p);
145	return octmp;	145	return octmp;
146	}	146	}
		147	const void * __attribute__((unused)) __ASN1_pack_string=(const void*)openssl_fcast(ASN1_pack_string);
147		148
148	#endif	149	#endif
149		150

Lines 305-310 Link Here

(-)openssl-0.9.8e/crypto/ocsp/ocsp_ext.c.ark (+1 lines)
305	if (b) OPENSSL_free(b);	305	if (b) OPENSSL_free(b);
306	return NULL;	306	return NULL;
307	}	307	}
		308	const void * __attribute__((unused)) __ASN1_STRING_encode=(const void*)openssl_fcast(ASN1_STRING_encode);
308		309
309	/* Nonce handling functions */	310	/* Nonce handling functions */
310		311




        BIO_free(b);
        return(ret);
	}
const void * __attribute__((unused)) __PEM_ASN1_read=(const void*)openssl_fcast(PEM_ASN1_read);
#endif

static int check_pem(const char *nm, const char *name)

        BIO_free(b);
        return(ret);
        }
const void * __attribute__((unused)) __PEM_ASN1_write=(const void*)openssl_fcast(PEM_ASN1_write);
#endif

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

		}
	return(ret);
	}
const void * __attribute__((unused)) __PEM_ASN1_write_bio=(const void*)openssl_fcast(PEM_ASN1_write_bio);

int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
	     pem_password_cb *callback,void *u)

Lines 84-86 Link Here

(-)openssl-0.9.8e/crypto/pem/pem_oth.c.ark (+1 lines)
84	OPENSSL_free(data);	84	OPENSSL_free(data);
85	return(ret);	85	return(ret);
86	}	86	}
		87	const void * __attribute__((unused)) __PEM_ASN1_read_bio=(const void*)openssl_fcast(PEM_ASN1_read_bio);

Return to bug 158324

Lines 174-179 Link Here

(-)openssl-0.9.8e/crypto/pem/pem_lib.c.ark (+3 lines)
174	BIO_free(b);	174	BIO_free(b);
175	return(ret);	175	return(ret);
176	}	176	}
		177	const void * __attribute__((unused)) __PEM_ASN1_read=(const void*)openssl_fcast(PEM_ASN1_read);
177	#endif	178	#endif
178		179
179	static int check_pem(const char nm, const char name)	180	static int check_pem(const char nm, const char name)
Lines 277-282 Link Here
277	BIO_free(b);	278	BIO_free(b);
278	return(ret);	279	return(ret);
279	}	280	}
		281	const void * __attribute__((unused)) __PEM_ASN1_write=(const void*)openssl_fcast(PEM_ASN1_write);
280	#endif	282	#endif
281		283
282	int PEM_ASN1_write_bio(i2d_of_void i2d, const char name, BIO *bp,	284	int PEM_ASN1_write_bio(i2d_of_void i2d, const char name, BIO *bp,
Lines 381-386 Link Here
381	}	383	}
382	return(ret);	384	return(ret);
383	}	385	}
		386	const void * __attribute__((unused)) __PEM_ASN1_write_bio=(const void*)openssl_fcast(PEM_ASN1_write_bio);
384		387
385	int PEM_do_header(EVP_CIPHER_INFO cipher, unsigned char data, long *plen,	388	int PEM_do_header(EVP_CIPHER_INFO cipher, unsigned char data, long *plen,
386	pem_password_cb callback,void u)	389	pem_password_cb callback,void u)

Lines 902-924 Link Here

(-)openssl-0.9.8e/crypto/asn1/asn1.h.gcc42~ (-9 / +15 lines)
902		902
903	/* Used to implement other functions */	903	/* Used to implement other functions */
904	void ASN1_dup(i2d_of_void i2d, d2i_of_void d2i, char x);	904	void ASN1_dup(i2d_of_void i2d, d2i_of_void d2i, char x);
		905	extern const void *__ASN1_dup;
905	#define ASN1_dup_of(type,i2d,d2i,x) \	906	#define ASN1_dup_of(type,i2d,d2i,x) \
906	((type ()(I2D_OF(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)	907	((type ()(I2D_OF(type),D2I_OF(type),type *))__ASN1_dup)(i2d,d2i,x)
907	#define ASN1_dup_of_const(type,i2d,d2i,x) \	908	#define ASN1_dup_of_const(type,i2d,d2i,x) \
908	((type ()(I2D_OF_const(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)	909	((type ()(I2D_OF_const(type),D2I_OF(type),type *))__ASN1_dup)(i2d,d2i,x)
909		910
910	void ASN1_item_dup(const ASN1_ITEM it, void *x);	911	void ASN1_item_dup(const ASN1_ITEM it, void *x);
911		912
912	#ifndef OPENSSL_NO_FP_API	913	#ifndef OPENSSL_NO_FP_API
913	void ASN1_d2i_fp(void (xnew)(void), d2i_of_void d2i, FILE in, void *x);	914	void ASN1_d2i_fp(void (xnew)(void), d2i_of_void d2i, FILE in, void *x);
		915	extern const void *__ASN1_d2i_fp;
914	#define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \	916	#define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
915	((type ()(type ()(void),D2I_OF(type),FILE ,type *))openssl_fcast(ASN1_d2i_fp))(xnew,d2i,in,x)	917	((type ()(type ()(void),D2I_OF(type),FILE ,type *))__ASN1_d2i_fp)(xnew,d2i,in,x)
916	void ASN1_item_d2i_fp(const ASN1_ITEM it, FILE in, void x);	918	void ASN1_item_d2i_fp(const ASN1_ITEM it, FILE in, void x);
917	int ASN1_i2d_fp(i2d_of_void i2d,FILE out,void *x);	919	int ASN1_i2d_fp(i2d_of_void i2d,FILE out,void *x);
		920	extern const void *__ASN1_i2d_fp;
918	#define ASN1_i2d_fp_of(type,i2d,out,x) \	921	#define ASN1_i2d_fp_of(type,i2d,out,x) \
919	((int ()(I2D_OF(type),FILE ,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)	922	((int ()(I2D_OF(type),FILE ,type *))__ASN1_i2d_fp)(i2d,out,x)
920	#define ASN1_i2d_fp_of_const(type,i2d,out,x) \	923	#define ASN1_i2d_fp_of_const(type,i2d,out,x) \
921	((int ()(I2D_OF_const(type),FILE ,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)	924	((int ()(I2D_OF_const(type),FILE ,type *))__ASN1_i2d_fp)(i2d,out,x)
922	int ASN1_item_i2d_fp(const ASN1_ITEM it, FILE out, void *x);	925	int ASN1_item_i2d_fp(const ASN1_ITEM it, FILE out, void *x);
923	int ASN1_STRING_print_ex_fp(FILE fp, ASN1_STRING str, unsigned long flags);	926	int ASN1_STRING_print_ex_fp(FILE fp, ASN1_STRING str, unsigned long flags);
924	#endif	927	#endif
Lines 927-940 Link Here
927		930
928	#ifndef OPENSSL_NO_BIO	931	#ifndef OPENSSL_NO_BIO
929	void ASN1_d2i_bio(void (xnew)(void), d2i_of_void d2i, BIO in, void *x);	932	void ASN1_d2i_bio(void (xnew)(void), d2i_of_void d2i, BIO in, void *x);
		933	extern const void *__ASN1_d2i_bio;
930	#define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \	934	#define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
931	((type ()(type ()(void),D2I_OF(type),BIO ,type *))openssl_fcast(ASN1_d2i_bio))(xnew,d2i,in,x)	935	((type ()(type ()(void),D2I_OF(type),BIO ,type *))__ASN1_d2i_bio)(xnew,d2i,in,x)
932	void ASN1_item_d2i_bio(const ASN1_ITEM it, BIO in, void x);	936	void ASN1_item_d2i_bio(const ASN1_ITEM it, BIO in, void x);
933	int ASN1_i2d_bio(i2d_of_void i2d,BIO out, unsigned char *x);	937	int ASN1_i2d_bio(i2d_of_void i2d,BIO out, unsigned char *x);
		938	extern const void *__ASN1_i2d_bio;
934	#define ASN1_i2d_bio_of(type,i2d,out,x) \	939	#define ASN1_i2d_bio_of(type,i2d,out,x) \
935	((int ()(I2D_OF(type),BIO ,type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)	940	((int ()(I2D_OF(type),BIO ,type *))__ASN1_i2d_bio)(i2d,out,x)
936	#define ASN1_i2d_bio_of_const(type,i2d,out,x) \	941	#define ASN1_i2d_bio_of_const(type,i2d,out,x) \
937	((int ()(I2D_OF_const(type),BIO ,const type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)	942	((int ()(I2D_OF_const(type),BIO ,const type *))__ASN1_i2d_bio)(i2d,out,x)
938	int ASN1_item_i2d_bio(const ASN1_ITEM it, BIO out, void *x);	943	int ASN1_item_i2d_bio(const ASN1_ITEM it, BIO out, void *x);
939	int ASN1_UTCTIME_print(BIO fp,ASN1_UTCTIME a);	944	int ASN1_UTCTIME_print(BIO fp,ASN1_UTCTIME a);
940	int ASN1_GENERALIZEDTIME_print(BIO fp,ASN1_GENERALIZEDTIME a);	945	int ASN1_GENERALIZEDTIME_print(BIO fp,ASN1_GENERALIZEDTIME a);
Lines 977-984 Link Here
977	void ASN1_item_unpack(ASN1_STRING oct, const ASN1_ITEM *it);	982	void ASN1_item_unpack(ASN1_STRING oct, const ASN1_ITEM *it);
978	ASN1_STRING ASN1_pack_string(void obj, i2d_of_void *i2d,	983	ASN1_STRING ASN1_pack_string(void obj, i2d_of_void *i2d,
979	ASN1_OCTET_STRING **oct);	984	ASN1_OCTET_STRING **oct);
		985	extern const void *__ASN1_pack_string;
980	#define ASN1_pack_string_of(type,obj,i2d,oct) \	986	#define ASN1_pack_string_of(type,obj,i2d,oct) \
981	((ASN1_STRING ()(type ,I2D_OF(type),ASN1_OCTET_STRING *))openssl_fcast(ASN1_pack_string))(obj,i2d,oct)	987	((ASN1_STRING ()(type ,I2D_OF(type),ASN1_OCTET_STRING *))__ASN1_pack_string)(obj,i2d,oct)
982	ASN1_STRING ASN1_item_pack(void obj, const ASN1_ITEM it, ASN1_OCTET_STRING *oct);	988	ASN1_STRING ASN1_item_pack(void obj, const ASN1_ITEM it, ASN1_OCTET_STRING *oct);
983		989
984	void ASN1_STRING_set_default_mask(unsigned long mask);	990	void ASN1_STRING_set_default_mask(unsigned long mask);

Lines 220-238 Link Here

(-)openssl-0.9.8e/crypto/pem/pem.h.gcc42~ (-12 / +16 lines)
220	#define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \	220	#define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
221	type PEM_read_##name(FILE fp, type *x, pem_password_cb cb, void *u)\	221	type PEM_read_##name(FILE fp, type *x, pem_password_cb cb, void *u)\
222	{ \	222	{ \
223	return(((type ()(D2I_OF(type),char ,FILE ,type *,pem_password_cb ,void *))openssl_fcast(PEM_ASN1_read))(d2i_##asn1, str,fp,x,cb,u)); \	223	return(((type ()(D2I_OF(type),char ,FILE ,type *,pem_password_cb ,void *))__PEM_ASN1_read)(d2i_##asn1, str,fp,x,cb,u)); \
224	}	224	}
225		225
226	#define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \	226	#define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
227	int PEM_write_##name(FILE fp, type x) \	227	int PEM_write_##name(FILE fp, type x) \
228	{ \	228	{ \
229	return(((int ()(I2D_OF(type),const char ,FILE ,type , const EVP_CIPHER ,unsigned char ,int, pem_password_cb ,void ))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \	229	return(((int ()(I2D_OF(type),const char ,FILE ,type , const EVP_CIPHER ,unsigned char ,int, pem_password_cb ,void ))__PEM_ASN1_write)(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
230	}	230	}
231		231
232	#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \	232	#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
233	int PEM_write_##name(FILE fp, const type x) \	233	int PEM_write_##name(FILE fp, const type x) \
234	{ \	234	{ \
235	return(((int ()(I2D_OF_const(type),const char ,FILE , const type , const EVP_CIPHER ,unsigned char ,int, pem_password_cb ,void ))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \	235	return(((int ()(I2D_OF_const(type),const char ,FILE , const type , const EVP_CIPHER ,unsigned char ,int, pem_password_cb ,void ))__PEM_ASN1_write)(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
236	}	236	}
237		237
238	#define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \	238	#define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
Lines 240-246 Link Here
240	unsigned char kstr, int klen, pem_password_cb cb, \	243	unsigned char kstr, int klen, pem_password_cb cb, \
241	void *u) \	244	void *u) \
242	{ \	245	{ \
243	return(((int ()(I2D_OF(type),const char ,FILE ,type , const EVP_CIPHER ,unsigned char ,int, pem_password_cb ,void ))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \	246	return(((int ()(I2D_OF(type),const char ,FILE ,type , const EVP_CIPHER ,unsigned char ,int, pem_password_cb ,void ))__PEM_ASN1_write)(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
244	}	247	}
245		248
246	#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \	249	#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
Lines 248-254 Link Here
248	unsigned char kstr, int klen, pem_password_cb cb, \	252	unsigned char kstr, int klen, pem_password_cb cb, \
249	void *u) \	253	void *u) \
250	{ \	254	{ \
251	return(((int ()(I2D_OF_const(type),const char ,FILE ,type , const EVP_CIPHER ,unsigned char ,int, pem_password_cb ,void ))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \	255	return(((int ()(I2D_OF_const(type),const char ,FILE ,type , const EVP_CIPHER ,unsigned char ,int, pem_password_cb ,void ))__PEM_ASN1_write)(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u)); \
252	}	256	}
253		257
254	#endif	258	#endif
Lines 256-288 Link Here
256	#define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \	261	#define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
257	type PEM_read_bio_##name(BIO bp, type *x, pem_password_cb cb, void *u)\	262	type PEM_read_bio_##name(BIO bp, type *x, pem_password_cb cb, void *u)\
258	{ \	263	{ \
259	return(((type ()(D2I_OF(type),const char ,BIO ,type *,pem_password_cb ,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i_##asn1, str,bp,x,cb,u)); \	264	return(((type ()(D2I_OF(type),const char ,BIO ,type *,pem_password_cb ,void *))__PEM_ASN1_read_bio)(d2i_##asn1, str,bp,x,cb,u)); \
260	}	265	}
261		266
262	#define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \	267	#define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
263	int PEM_write_bio_##name(BIO bp, type x) \	268	int PEM_write_bio_##name(BIO bp, type x) \
264	{ \	269	{ \
265	return(((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_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \	270	return(((int ()(I2D_OF(type),const char ,BIO ,type , const EVP_CIPHER ,unsigned char ,int, pem_password_cb ,void ))__PEM_ASN1_write_bio)(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \
266	}	271	}
267		272
268	#define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \	273	#define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
269	int PEM_write_bio_##name(BIO bp, const type x) \	274	int PEM_write_bio_##name(BIO bp, const type x) \
270	{ \	275	{ \
271	return(((int ()(I2D_OF_const(type),const char ,BIO ,const type , const EVP_CIPHER ,unsigned char ,int, pem_password_cb ,void ))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \	276	return(((int ()(I2D_OF_const(type),const char ,BIO ,const type , const EVP_CIPHER ,unsigned char ,int, pem_password_cb ,void ))__PEM_ASN1_write_bio)(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \
272	}	277	}
273		278
274	#define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \	279	#define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
275	int PEM_write_bio_##name(BIO bp, type x, const EVP_CIPHER *enc, \	280	int PEM_write_bio_##name(BIO bp, type x, const EVP_CIPHER *enc, \
276	unsigned char kstr, int klen, pem_password_cb cb, void *u) \	281	unsigned char kstr, int klen, pem_password_cb cb, void *u) \
277	{ \	282	{ \
278	return(((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_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \	283	return(((int ()(I2D_OF(type),const char ,BIO ,type ,const EVP_CIPHER ,unsigned char ,int,pem_password_cb ,void ))__PEM_ASN1_write_bio)(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \
279	}	284	}
280		285
281	#define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \	286	#define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
282	int PEM_write_bio_##name(BIO bp, type x, const EVP_CIPHER *enc, \	287	int PEM_write_bio_##name(BIO bp, type x, const EVP_CIPHER *enc, \
283	unsigned char kstr, int klen, pem_password_cb cb, void *u) \	288	unsigned char kstr, int klen, pem_password_cb cb, void *u) \
284	{ \	289	{ \
285	return(((int ()(I2D_OF_const(type),const char ,BIO ,type ,const EVP_CIPHER ,unsigned char ,int,pem_password_cb ,void ))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \	290	return(((int ()(I2D_OF_const(type),const char ,BIO ,type ,const EVP_CIPHER ,unsigned char ,int,pem_password_cb ,void ))__PEM_ASN1_write_bio)(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u)); \
286	}	291	}
287		292
288	#define IMPLEMENT_PEM_write(name, type, str, asn1) \	293	#define IMPLEMENT_PEM_write(name, type, str, asn1) \
Lines 545-557 Link Here
545	pem_password_cb cb, void u);	555	pem_password_cb cb, void u);
546	void * PEM_ASN1_read_bio(d2i_of_void d2i, const char name, BIO *bp,	556	void * PEM_ASN1_read_bio(d2i_of_void d2i, const char name, BIO *bp,
547	void *x, pem_password_cb cb, void *u);	557	void *x, pem_password_cb cb, void *u);
		558	extern const void *__PEM_ASN1_read_bio;
548	#define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \	559	#define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \
549	((type ()(D2I_OF(type),const char ,BIO ,type *,pem_password_cb ,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i,name,bp,x,cb,u)	560	((type ()(D2I_OF(type),const char ,BIO ,type *,pem_password_cb ,void *))__PEM_ASN1_read_bio)(d2i,name,bp,x,cb,u)
550	int PEM_ASN1_write_bio(i2d_of_void i2d,const char name,BIO bp,char x,	561	int PEM_ASN1_write_bio(i2d_of_void i2d,const char name,BIO bp,char x,
551	const EVP_CIPHER enc,unsigned char kstr,int klen,	562	const EVP_CIPHER enc,unsigned char kstr,int klen,
552	pem_password_cb cb, void u);	563	pem_password_cb cb, void u);
		564	extern const void *__PEM_ASN1_write_bio;
553	#define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \	565	#define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \
554	((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)	566	((int ()(I2D_OF(type),const char ,BIO ,type , const EVP_CIPHER ,unsigned char ,int, pem_password_cb ,void ))__PEM_ASN1_write_bio)(i2d,name,bp,x,enc,kstr,klen,cb,u)
555		567
556	STACK_OF(X509_INFO) * PEM_X509_INFO_read_bio(BIO bp, STACK_OF(X509_INFO) sk, pem_password_cb cb, void u);	568	STACK_OF(X509_INFO) * PEM_X509_INFO_read_bio(BIO bp, STACK_OF(X509_INFO) sk, pem_password_cb cb, void u);
557	int PEM_X509_INFO_write_bio(BIO bp,X509_INFO xi, EVP_CIPHER *enc,	569	int PEM_X509_INFO_write_bio(BIO bp,X509_INFO xi, EVP_CIPHER *enc,
Lines 566-576 Link Here
566	int PEM_write(FILE fp,char name,char hdr,unsigned char data,long len);	566	int PEM_write(FILE fp,char name,char hdr,unsigned char data,long len);
567	void * PEM_ASN1_read(d2i_of_void d2i, const char name, FILE fp, void *x,	567	void * PEM_ASN1_read(d2i_of_void d2i, const char name, FILE fp, void *x,
568	pem_password_cb cb, void u);	568	pem_password_cb cb, void u);
		569	extern const void *__PEM_ASN1_read;
569	int PEM_ASN1_write(i2d_of_void i2d,const char name,FILE *fp,	570	int PEM_ASN1_write(i2d_of_void i2d,const char name,FILE *fp,
570	char x,const EVP_CIPHER enc,unsigned char *kstr,	571	char x,const EVP_CIPHER enc,unsigned char *kstr,
571	int klen,pem_password_cb callback, void u);	572	int klen,pem_password_cb callback, void u);
572	STACK_OF(X509_INFO) * PEM_X509_INFO_read(FILE fp, STACK_OF(X509_INFO) sk,	573	STACK_OF(X509_INFO) * PEM_X509_INFO_read(FILE fp, STACK_OF(X509_INFO) sk,
573	pem_password_cb cb, void u);	574	pem_password_cb cb, void u);
		575	extern const void *__PEM_ASN1_write;
574	#endif	576	#endif
575		577
576	int PEM_SealInit(PEM_ENCODE_SEAL_CTX ctx, EVP_CIPHER type,	578	int PEM_SealInit(PEM_ENCODE_SEAL_CTX ctx, EVP_CIPHER type,