Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 179600
Collapse All | Expand All

(-)openssl-0.9.8d.orig/crypto/asn1/asn1.h (-9 / +9 lines)
Lines 903-924 Link Here
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
#define ASN1_dup_of(type,i2d,d2i,x) \
905
#define ASN1_dup_of(type,i2d,d2i,x) \
906
	((type *(*)(I2D_OF(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)
906
    	((type *)ASN1_dup((i2d_of_void *)(i2d), (d2i_of_void *)(d2i), (char *)(x)))
907
#define ASN1_dup_of_const(type,i2d,d2i,x) \
907
#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)
908
    	((type *)ASN1_dup((i2d_of_void *)(i2d), (d2i_of_void *)(d2i), (char *)(x)))
909
909
910
void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
910
void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
911
911
912
#ifndef OPENSSL_NO_FP_API
912
#ifndef OPENSSL_NO_FP_API
913
void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);
913
void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);
914
#define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
914
#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)
915
	((type *)ASN1_d2i_fp((void *(*)(void))(xnew), (d2i_of_void *)(d2i), (in), (void **)(x)))
916
void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);
916
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);
917
int ASN1_i2d_fp(i2d_of_void *i2d,FILE *out,void *x);
918
#define ASN1_i2d_fp_of(type,i2d,out,x) \
918
#define ASN1_i2d_fp_of(type,i2d,out,x) \
919
	((int (*)(I2D_OF(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)
919
	(ASN1_i2d_fp((i2d_of_void *)(i2d), (out), (x)))
920
#define ASN1_i2d_fp_of_const(type,i2d,out,x) \
920
#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)
921
	(ASN1_i2d_fp((i2d_of_void *)(i2d), (out), (x)))
922
int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x);
922
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);
923
int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags);
924
#endif
924
#endif
Lines 928-940 Link Here
928
#ifndef OPENSSL_NO_BIO
928
#ifndef OPENSSL_NO_BIO
929
void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);
929
void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);
930
#define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
930
#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)
931
	((type *)ASN1_d2i_bio( (void *(*)(void))(xnew), (d2i_of_void *)(d2i), (in), (void **)(x)))
932
void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);
932
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);
933
int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x);
934
#define ASN1_i2d_bio_of(type,i2d,out,x) \
934
#define ASN1_i2d_bio_of(type,i2d,out,x) \
935
	((int (*)(I2D_OF(type),BIO *,type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)
935
    	(ASN1_i2d_bio((i2d_of_void *)(i2d), (out), (void *)(x)))
936
#define ASN1_i2d_bio_of_const(type,i2d,out,x) \
936
#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)
937
    	(ASN1_i2d_bio((i2d_of_void *)(i2d), (out), (void *)(x)))
938
int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);
938
int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);
939
int ASN1_UTCTIME_print(BIO *fp,ASN1_UTCTIME *a);
939
int ASN1_UTCTIME_print(BIO *fp,ASN1_UTCTIME *a);
940
int ASN1_GENERALIZEDTIME_print(BIO *fp,ASN1_GENERALIZEDTIME *a);
940
int ASN1_GENERALIZEDTIME_print(BIO *fp,ASN1_GENERALIZEDTIME *a);
Lines 978-984 Link Here
978
ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
978
ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
979
			      ASN1_OCTET_STRING **oct);
979
			      ASN1_OCTET_STRING **oct);
980
#define ASN1_pack_string_of(type,obj,i2d,oct) \
980
#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)
981
    	(ASN1_pack_string((obj), (i2d_of_void *)(i2d), (oct)))
982
ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct);
982
ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct);
983
983
984
void ASN1_STRING_set_default_mask(unsigned long mask);
984
void ASN1_STRING_set_default_mask(unsigned long mask);
(-)openssl-0.9.8d.orig/crypto/ocsp/ocsp.h (-1 / +1 lines)
Lines 469-475 Link Here
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
#define ASN1_STRING_encode_of(type,s,i2d,data,sk) \
471
#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)
472
(ASN1_STRING_encode((s), (i2d_of_void *)(i2d), (data), (STACK_OF(ASN1_OBJECT) *)(sk)))
473
473
474
X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);
474
X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);
475
475
(-)openssl-0.9.8d.orig/crypto/pem/pem.h (-13 / +15 lines)
Lines 220-238 Link Here
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 *)PEM_ASN1_read( \
224
} \
224
	(d2i_of_void *)d2i_##asn1,str,fp,(void **)x,cb,u)); \
225
}
225
226
226
#define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
227
#define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
227
int PEM_write_##name(FILE *fp, type *x) \
228
int PEM_write_##name(FILE *fp, type *x) \
228
{ \
229
{ \
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)); \
230
return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,NULL,NULL,0,NULL,NULL)); \
230
}
231
}
231
232
232
#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
233
#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
233
int PEM_write_##name(FILE *fp, const type *x) \
234
int PEM_write_##name(FILE *fp, const type *x) \
234
{ \
235
{ \
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)); \
236
return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,NULL,NULL,0,NULL,NULL)); \
236
}
237
}
237
238
238
#define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
239
#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, \
241
	     unsigned char *kstr, int klen, pem_password_cb *cb, \
241
		  void *u) \
242
		  void *u) \
242
	{ \
243
	{ \
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)); \
244
return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,enc,kstr,klen,cb,u)); \
244
	}
245
	}
245
246
246
#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
247
#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, \
249
	     unsigned char *kstr, int klen, pem_password_cb *cb, \
249
		  void *u) \
250
		  void *u) \
250
	{ \
251
	{ \
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)); \
252
return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,enc,kstr,klen,cb,u)); \
252
	}
253
	}
253
254
254
#endif
255
#endif
Lines 256-288 Link Here
256
#define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
257
#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)\
258
type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
258
{ \
259
{ \
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)); \
260
return((type *)PEM_ASN1_read_bio( \
261
	(d2i_of_void *)d2i_##asn1,str,bp,(void **)x,cb,u)); \
260
}
262
}
261
263
262
#define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
264
#define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
263
int PEM_write_bio_##name(BIO *bp, type *x) \
265
int PEM_write_bio_##name(BIO *bp, type *x) \
264
{ \
266
{ \
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)); \
267
return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,NULL,NULL,0,NULL,NULL)); \
266
}
268
}
267
269
268
#define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
270
#define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
269
int PEM_write_bio_##name(BIO *bp, const type *x) \
271
int PEM_write_bio_##name(BIO *bp, const type *x) \
270
{ \
272
{ \
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)); \
273
return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,NULL,NULL,0,NULL,NULL)); \
272
}
274
}
273
275
274
#define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
276
#define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
275
int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
277
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) \
278
	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
277
	{ \
279
	{ \
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)); \
280
return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,enc,kstr,klen,cb,u)); \
279
	}
281
	}
280
282
281
#define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
283
#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, \
284
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) \
285
	     unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
284
	{ \
286
	{ \
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)); \
287
return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,enc,kstr,klen,cb,u)); \
286
	}
288
	}
287
289
288
#define IMPLEMENT_PEM_write(name, type, str, asn1) \
290
#define IMPLEMENT_PEM_write(name, type, str, asn1) \
Lines 546-557 Link Here
546
void *	PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp,
548
void *	PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp,
547
			  void **x, pem_password_cb *cb, void *u);
549
			  void **x, pem_password_cb *cb, void *u);
548
#define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \
550
#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)
551
((type *)PEM_ASN1_read_bio((d2i_of_void *)d2i,name,bp,(void **)x,cb,u))
550
int	PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp,char *x,
552
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,
553
			   const EVP_CIPHER *enc,unsigned char *kstr,int klen,
552
			   pem_password_cb *cb, void *u);
554
			   pem_password_cb *cb, void *u);
553
#define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \
555
#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)
556
	(PEM_ASN1_write_bio)((i2d_of_void *)i2d,name,bp,(char *)x,enc,kstr,klen,cb,u)
555
557
556
STACK_OF(X509_INFO) *	PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u);
558
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,
559
int	PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc,

Return to bug 179600