]> git.pld-linux.org Git - packages/openssl.git/blame - openssl-gcc_4_2.patch
projects / packages / openssl.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- update from bero
[packages/openssl.git] / openssl-gcc_4_2.patch
CommitLineData
674f7979
AM		 1--- openssl-0.9.8e/crypto/asn1/asn1.h.gcc42~ 2006-02-19 14:45:22.000000000 +0100
2+++ openssl-0.9.8e/crypto/asn1/asn1.h 2007-03-04 12:35:59.000000000 +0100
a1ca6ba5
JK		 3@@ -902,23 +902,26 @@
4
5 /* Used to implement other functions */
6 void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x);
674f7979 7+extern const void *__ASN1_dup;
a1ca6ba5
JK		 8 #define ASN1_dup_of(type,i2d,d2i,x) \
9- ((type *(*)(I2D_OF(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)
10+ ((type *(*)(I2D_OF(type),D2I_OF(type),type *))__ASN1_dup)(i2d,d2i,x)
11 #define ASN1_dup_of_const(type,i2d,d2i,x) \
12- ((type *(*)(I2D_OF_const(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)
13+ ((type *(*)(I2D_OF_const(type),D2I_OF(type),type *))__ASN1_dup)(i2d,d2i,x)
14
15 void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
16
17 #ifndef OPENSSL_NO_FP_API
18 void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);
674f7979 19+extern const void *__ASN1_d2i_fp;
a1ca6ba5
JK		 20 #define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
21- ((type *(*)(type *(*)(void),D2I_OF(type),FILE *,type **))openssl_fcast(ASN1_d2i_fp))(xnew,d2i,in,x)
22+ ((type *(*)(type *(*)(void),D2I_OF(type),FILE *,type **))__ASN1_d2i_fp)(xnew,d2i,in,x)
23 void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);
24 int ASN1_i2d_fp(i2d_of_void *i2d,FILE *out,void *x);
674f7979 25+extern const void *__ASN1_i2d_fp;
a1ca6ba5
JK		 26 #define ASN1_i2d_fp_of(type,i2d,out,x) \
27- ((int (*)(I2D_OF(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)
28+ ((int (*)(I2D_OF(type),FILE *,type *))__ASN1_i2d_fp)(i2d,out,x)
29 #define ASN1_i2d_fp_of_const(type,i2d,out,x) \
30- ((int (*)(I2D_OF_const(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)
31+ ((int (*)(I2D_OF_const(type),FILE *,type *))__ASN1_i2d_fp)(i2d,out,x)
32 int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x);
33 int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags);
34 #endif
35@@ -927,14 +930,16 @@
36
37 #ifndef OPENSSL_NO_BIO
38 void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);
674f7979 39+extern const void *__ASN1_d2i_bio;
a1ca6ba5
JK		 40 #define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
41- ((type *(*)(type *(*)(void),D2I_OF(type),BIO *,type **))openssl_fcast(ASN1_d2i_bio))(xnew,d2i,in,x)
42+ ((type *(*)(type *(*)(void),D2I_OF(type),BIO *,type **))__ASN1_d2i_bio)(xnew,d2i,in,x)
43 void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);
44 int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x);
674f7979 45+extern const void *__ASN1_i2d_bio;
a1ca6ba5
JK		 46 #define ASN1_i2d_bio_of(type,i2d,out,x) \
47- ((int (*)(I2D_OF(type),BIO *,type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)
48+ ((int (*)(I2D_OF(type),BIO *,type *))__ASN1_i2d_bio)(i2d,out,x)
49 #define ASN1_i2d_bio_of_const(type,i2d,out,x) \
50- ((int (*)(I2D_OF_const(type),BIO *,const type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)
51+ ((int (*)(I2D_OF_const(type),BIO *,const type *))__ASN1_i2d_bio)(i2d,out,x)
52 int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);
53 int ASN1_UTCTIME_print(BIO *fp,ASN1_UTCTIME *a);
54 int ASN1_GENERALIZEDTIME_print(BIO *fp,ASN1_GENERALIZEDTIME *a);
55@@ -977,8 +982,9 @@
56 void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it);
57 ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
58 ASN1_OCTET_STRING **oct);
674f7979 59+extern const void *__ASN1_pack_string;
a1ca6ba5
JK		 60 #define ASN1_pack_string_of(type,obj,i2d,oct) \
61- ((ASN1_STRING *(*)(type *,I2D_OF(type),ASN1_OCTET_STRING **))openssl_fcast(ASN1_pack_string))(obj,i2d,oct)
62+ ((ASN1_STRING *(*)(type *,I2D_OF(type),ASN1_OCTET_STRING **))__ASN1_pack_string)(obj,i2d,oct)
63 ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct);
64
65 void ASN1_STRING_set_default_mask(unsigned long mask);
674f7979
AM		 66--- openssl-0.9.8e/crypto/ocsp/ocsp.h.gcc42~ 2005-05-13 01:01:43.000000000 +0200
67+++ openssl-0.9.8e/crypto/ocsp/ocsp.h 2007-03-04 12:35:59.000000000 +0100
a1ca6ba5
JK		 68@@ -468,8 +468,9 @@
69
70 ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
71 void *data, STACK_OF(ASN1_OBJECT) *sk);
674f7979 72+extern const void *__ASN1_STRING_encode;
a1ca6ba5
JK		 73 #define ASN1_STRING_encode_of(type,s,i2d,data,sk) \
74-((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))openssl_fcast(ASN1_STRING_encode))(s,i2d,data,sk)
75+((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))__ASN1_STRING_encode)(s,i2d,data,sk)
76
77 X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);
78
674f7979
AM		 79--- openssl-0.9.8e/crypto/pem/pem.h.gcc42~ 2006-12-19 20:47:36.000000000 +0100
80+++ openssl-0.9.8e/crypto/pem/pem.h 2007-03-04 12:44:19.000000000 +0100
81@@ -220,19 +220,19 @@
a1ca6ba5
JK		 82 #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
83 type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
84 { \
85-return(((type *(*)(D2I_OF(type),char *,FILE *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read))(d2i_##asn1, str,fp,x,cb,u)); \
a1ca6ba5 86+return(((type *(*)(D2I_OF(type),char *,FILE *,type **,pem_password_cb *,void *))__PEM_ASN1_read)(d2i_##asn1, str,fp,x,cb,u)); \
a8f5bcdd 87 }
a1ca6ba5
JK		 88
89 #define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
90 int PEM_write_##name(FILE *fp, type *x) \
91 { \
92-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)); \
a1ca6ba5
JK		 93+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)); \
94 }
95
96 #define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
97 int PEM_write_##name(FILE *fp, const type *x) \
98 { \
99-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)); \
a1ca6ba5
JK		 100+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)); \
101 }
102
103 #define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
674f7979 104@@ -240,7 +243,7 @@
a1ca6ba5
JK		 105 unsigned char *kstr, int klen, pem_password_cb *cb, \
106 void *u) \
107 { \
108- 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)); \
a1ca6ba5
JK		 109+ 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)); \
110 }
111
112 #define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
674f7979 113@@ -248,7 +252,7 @@
a1ca6ba5
JK		 114 unsigned char *kstr, int klen, pem_password_cb *cb, \
115 void *u) \
116 { \
117- 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)); \
a1ca6ba5
JK		 118+ 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)); \
119 }
120
121 #endif
674f7979 122@@ -256,33 +261,33 @@
a1ca6ba5
JK		 123 #define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
124 type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
125 { \
126-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)); \
a1ca6ba5
JK		 127+return(((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))__PEM_ASN1_read_bio)(d2i_##asn1, str,bp,x,cb,u)); \
128 }
129
130 #define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
131 int PEM_write_bio_##name(BIO *bp, type *x) \
132 { \
133-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)); \
a1ca6ba5
JK		 134+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)); \
135 }
136
137 #define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
138 int PEM_write_bio_##name(BIO *bp, const type *x) \
139 { \
140-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)); \
a1ca6ba5
JK		 141+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)); \
142 }
143
144 #define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
145 int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
146 unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
147 { \
148- 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)); \
a1ca6ba5
JK		 149+ 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)); \
150 }
151
152 #define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
153 int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
154 unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
155 { \
156- 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)); \
a1ca6ba5
JK		 157+ 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)); \
158 }
159
160 #define IMPLEMENT_PEM_write(name, type, str, asn1) \
161@@ -545,13 +555,15 @@
162 pem_password_cb *cb, void *u);
163 void * PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp,
164 void **x, pem_password_cb *cb, void *u);
674f7979 165+extern const void *__PEM_ASN1_read_bio;
a1ca6ba5
JK		 166 #define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \
167-((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i,name,bp,x,cb,u)
168+((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))__PEM_ASN1_read_bio)(d2i,name,bp,x,cb,u)
169 int PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp,char *x,
170 const EVP_CIPHER *enc,unsigned char *kstr,int klen,
171 pem_password_cb *cb, void *u);
674f7979 172+extern const void *__PEM_ASN1_write_bio;
a1ca6ba5
JK		 173 #define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \
174- ((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)
175+ ((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)
176
177 STACK_OF(X509_INFO) * PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u);
178 int PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc,
674f7979
AM		 179@@ -566,11 +566,13 @@
180 int PEM_write(FILE *fp,char *name,char *hdr,unsigned char *data,long len);
181 void * PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
182 pem_password_cb *cb, void *u);
183+extern const void *__PEM_ASN1_read;
184 int PEM_ASN1_write(i2d_of_void *i2d,const char *name,FILE *fp,
185 char *x,const EVP_CIPHER *enc,unsigned char *kstr,
186 int klen,pem_password_cb *callback, void *u);
187 STACK_OF(X509_INFO) * PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,
188 pem_password_cb *cb, void *u);
189+extern const void *__PEM_ASN1_write;
190 #endif
191
192 int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type,
193--- openssl-0.9.8e/crypto/asn1/a_d2i_fp.c.ark 2007-04-17 17:50:28.000000000 +0000
194+++ openssl-0.9.8e/crypto/asn1/a_d2i_fp.c 2007-04-17 19:17:24.000000000 +0000
195@@ -81,6 +81,7 @@
196 BIO_free(b);
197 return(ret);
198 }
199+const void * __attribute__((unused)) __ASN1_d2i_fp=(const void*)openssl_fcast(ASN1_d2i_fp);
200 #endif
201
202 void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x)
203@@ -99,6 +100,7 @@
204 if (b != NULL) BUF_MEM_free(b);
205 return(ret);
206 }
207+const void * __attribute__((unused)) __ASN1_d2i_bio=(const void*)openssl_fcast(ASN1_d2i_bio);
208
209 #endif
210
211--- openssl-0.9.8e/crypto/asn1/a_dup.c.ark 2007-04-17 17:49:31.000000000 +0000
212+++ openssl-0.9.8e/crypto/asn1/a_dup.c 2007-04-17 17:49:59.000000000 +0000
213@@ -82,6 +82,7 @@
214 OPENSSL_free(b);
215 return(ret);
216 }
217+const void * __attribute__((unused)) __ASN1_dup=(const void*)openssl_fcast(ASN1_dup);
218
219 #endif
220
221--- openssl-0.9.8e/crypto/asn1/a_i2d_fp.c.ark 2007-04-17 17:52:19.000000000 +0000
222+++ openssl-0.9.8e/crypto/asn1/a_i2d_fp.c 2007-04-17 19:19:29.000000000 +0000
223@@ -79,6 +79,7 @@
224 BIO_free(b);
225 return(ret);
226 }
227+const void * __attribute__((unused)) __ASN1_i2d_fp=(const void*)openssl_fcast(ASN1_i2d_fp);
228 #endif
229
230 int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x)
231@@ -113,6 +114,7 @@
232 OPENSSL_free(b);
233 return(ret);
234 }
235+const void * __attribute__((unused)) __ASN1_i2d_bio=(const void*)openssl_fcast(ASN1_i2d_bio);
236
237 #endif
238
239--- openssl-0.9.8e/crypto/asn1/asn_pack.c.ark 2007-04-17 19:18:35.000000000 +0000
240+++ openssl-0.9.8e/crypto/asn1/asn_pack.c 2007-04-17 19:19:20.000000000 +0000
241@@ -144,6 +144,7 @@
242 i2d (obj, &p);
243 return octmp;
244 }
245+const void * __attribute__((unused)) __ASN1_pack_string=(const void*)openssl_fcast(ASN1_pack_string);
246
247 #endif
248
249--- openssl-0.9.8e/crypto/ocsp/ocsp_ext.c.ark 2007-04-17 19:20:35.000000000 +0000
250+++ openssl-0.9.8e/crypto/ocsp/ocsp_ext.c 2007-04-17 19:21:19.000000000 +0000
251@@ -305,6 +305,7 @@
252 if (b) OPENSSL_free(b);
253 return NULL;
254 }
255+const void * __attribute__((unused)) __ASN1_STRING_encode=(const void*)openssl_fcast(ASN1_STRING_encode);
256
257 /* Nonce handling functions */
258
259--- openssl-0.9.8e/crypto/pem/pem_lib.c.ark 2007-04-17 19:21:44.000000000 +0000
260+++ openssl-0.9.8e/crypto/pem/pem_lib.c 2007-04-17 19:26:35.000000000 +0000
261@@ -174,6 +174,7 @@
262 BIO_free(b);
263 return(ret);
264 }
265+const void * __attribute__((unused)) __PEM_ASN1_read=(const void*)openssl_fcast(PEM_ASN1_read);
266 #endif
267
268 static int check_pem(const char *nm, const char *name)
269@@ -277,6 +278,7 @@
270 BIO_free(b);
271 return(ret);
272 }
273+const void * __attribute__((unused)) __PEM_ASN1_write=(const void*)openssl_fcast(PEM_ASN1_write);
274 #endif
275
276 int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp,
277@@ -381,6 +383,7 @@
278 }
279 return(ret);
280 }
281+const void * __attribute__((unused)) __PEM_ASN1_write_bio=(const void*)openssl_fcast(PEM_ASN1_write_bio);
282
283 int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
284 pem_password_cb *callback,void *u)
285--- openssl-0.9.8e/crypto/pem/pem_oth.c.ark 2007-04-17 19:27:10.000000000 +0000
286+++ openssl-0.9.8e/crypto/pem/pem_oth.c 2007-04-17 19:30:00.000000000 +0000
287@@ -84,3 +84,4 @@
288 OPENSSL_free(data);
289 return(ret);
290 }
291+const void * __attribute__((unused)) __PEM_ASN1_read_bio=(const void*)openssl_fcast(PEM_ASN1_read_bio);
OpenSSL Toolkit libraries for the "Secure Sockets Layer" (SSL v2/v3)
This page took 0.468633 seconds and 4 git commands to generate.