OpenSDE
/
rocklinux
mirror of https://github.com/amery/rocklinux.git
2
0
Fork 0
Code Releases Wiki Activity
mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
7245 Commits
1 Branch
0 Tags
34 MiB
Tree: 5105e5ecf2
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '5105e5ecf2'
${ noResults }
rocklinux/package/base/openssl/gcc42-hotfix.patch

187 lines
10 KiB
Raw Normal View History

Clifford Wolf: Fixed openssl runtime errors (problem with gcc42 function pointer casting) [2007053009490531050] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8507 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
17 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  2. More information:
  3. http://gcc.gnu.org/ml/gcc/2006-07/msg00037.html
  4. http://marc.info/?l=freebsd-hackers&m=117964416009714&w=2
  6. Index: openssl/crypto/asn1/asn1.h
  7. ===================================================================
  8. RCS file: /home/ncvs/src/crypto/openssl/crypto/asn1/asn1.h,v
  9. retrieving revision 1.1.1.8
  10. diff -u -r1.1.1.8 asn1.h
  11. --- openssl/crypto/asn1/asn1.h 29 Jul 2006 19:10:16 -0000 1.1.1.8
  12. +++ openssl/crypto/asn1/asn1.h 20 May 2007 05:01:40 -0000
  13. @@ -903,22 +903,22 @@
  14. /* Used to implement other functions */
  15. void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x);
  16. #define ASN1_dup_of(type,i2d,d2i,x) \
  17. - ((type *(*)(I2D_OF(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)
  18. + ((type *)ASN1_dup((i2d_of_void *)(i2d), (d2i_of_void *)(d2i), (char *)(x)))
  19. #define ASN1_dup_of_const(type,i2d,d2i,x) \
  20. - ((type *(*)(I2D_OF_const(type),D2I_OF(type),type *))openssl_fcast(ASN1_dup))(i2d,d2i,x)
  21. + ((type *)ASN1_dup((i2d_of_void *)(i2d), (d2i_of_void *)(d2i), (char *)(x)))
  23. void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
  25. #ifndef OPENSSL_NO_FP_API
  26. void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);
  27. #define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
  28. - ((type *(*)(type *(*)(void),D2I_OF(type),FILE *,type **))openssl_fcast(ASN1_d2i_fp))(xnew,d2i,in,x)
  29. + ((type *)ASN1_d2i_fp((void *(*)(void))(xnew), (d2i_of_void *)(d2i), (in), (void **)(x)))
  30. void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);
  31. int ASN1_i2d_fp(i2d_of_void *i2d,FILE *out,void *x);
  32. #define ASN1_i2d_fp_of(type,i2d,out,x) \
  33. - ((int (*)(I2D_OF(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)
  34. + (ASN1_i2d_fp((i2d_of_void *)(i2d), (out), (x)))
  35. #define ASN1_i2d_fp_of_const(type,i2d,out,x) \
  36. - ((int (*)(I2D_OF_const(type),FILE *,type *))openssl_fcast(ASN1_i2d_fp))(i2d,out,x)
  37. + (ASN1_i2d_fp((i2d_of_void *)(i2d), (out), (x)))
  38. int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x);
  39. int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags);
  40. #endif
  41. @@ -928,13 +928,13 @@
  42. #ifndef OPENSSL_NO_BIO
  43. void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);
  44. #define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
  45. - ((type *(*)(type *(*)(void),D2I_OF(type),BIO *,type **))openssl_fcast(ASN1_d2i_bio))(xnew,d2i,in,x)
  46. + ((type *)ASN1_d2i_bio( (void *(*)(void))(xnew), (d2i_of_void *)(d2i), (in), (void **)(x)))
  47. void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);
  48. int ASN1_i2d_bio(i2d_of_void *i2d,BIO *out, unsigned char *x);
  49. #define ASN1_i2d_bio_of(type,i2d,out,x) \
  50. - ((int (*)(I2D_OF(type),BIO *,type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)
  51. + (ASN1_i2d_bio((i2d_of_void *)(i2d), (out), (void *)(x)))
  52. #define ASN1_i2d_bio_of_const(type,i2d,out,x) \
  53. - ((int (*)(I2D_OF_const(type),BIO *,const type *))openssl_fcast(ASN1_i2d_bio))(i2d,out,x)
  54. + (ASN1_i2d_bio((i2d_of_void *)(i2d), (out), (void *)(x)))
  55. int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);
  56. int ASN1_UTCTIME_print(BIO *fp,ASN1_UTCTIME *a);
  57. int ASN1_GENERALIZEDTIME_print(BIO *fp,ASN1_GENERALIZEDTIME *a);
  58. @@ -978,7 +978,7 @@
  59. ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
  60. ASN1_OCTET_STRING **oct);
  61. #define ASN1_pack_string_of(type,obj,i2d,oct) \
  62. - ((ASN1_STRING *(*)(type *,I2D_OF(type),ASN1_OCTET_STRING **))openssl_fcast(ASN1_pack_string))(obj,i2d,oct)
  63. + (ASN1_pack_string((obj), (i2d_of_void *)(i2d), (oct)))
  64. ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct);
  66. void ASN1_STRING_set_default_mask(unsigned long mask);
  67. Index: openssl/crypto/ocsp/ocsp.h
  68. ===================================================================
  69. RCS file: /home/ncvs/src/crypto/openssl/crypto/ocsp/ocsp.h,v
  70. retrieving revision 1.1.1.2
  71. diff -u -r1.1.1.2 ocsp.h
  72. --- openssl/crypto/ocsp/ocsp.h 29 Jul 2006 19:10:18 -0000 1.1.1.2
  73. +++ openssl/crypto/ocsp/ocsp.h 20 May 2007 05:13:06 -0000
  74. @@ -469,7 +469,7 @@
  75. ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
  76. void *data, STACK_OF(ASN1_OBJECT) *sk);
  77. #define ASN1_STRING_encode_of(type,s,i2d,data,sk) \
  78. -((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))openssl_fcast(ASN1_STRING_encode))(s,i2d,data,sk)
  79. +(ASN1_STRING_encode((s), (i2d_of_void *)(i2d), (data), (STACK_OF(ASN1_OBJECT) *)(sk)))
  81. X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);
  83. Index: openssl/crypto/pem/pem.h
  84. ===================================================================
  85. RCS file: /home/ncvs/src/crypto/openssl/crypto/pem/pem.h,v
  86. retrieving revision 1.1.1.7
  87. diff -u -r1.1.1.7 pem.h
  88. --- openssl/crypto/pem/pem.h 15 Mar 2007 20:03:01 -0000 1.1.1.7
  89. +++ openssl/crypto/pem/pem.h 20 May 2007 06:02:41 -0000
  90. @@ -220,19 +220,20 @@
  91. #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
  92. type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
  93. { \
  94. -return(((type *(*)(D2I_OF(type),char *,FILE *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read))(d2i_##asn1, str,fp,x,cb,u)); \
  95. -}
  96. +return((type *)PEM_ASN1_read( \
  97. + (d2i_of_void *)d2i_##asn1,str,fp,(void **)x,cb,u)); \
  98. +}
  100. #define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
  101. int PEM_write_##name(FILE *fp, type *x) \
  102. { \
  103. -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)); \
  104. +return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,NULL,NULL,0,NULL,NULL)); \
  105. }
  107. #define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
  108. int PEM_write_##name(FILE *fp, const type *x) \
  109. { \
  110. -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)); \
  111. +return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,NULL,NULL,0,NULL,NULL)); \
  112. }
  114. #define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
  115. @@ -240,7 +241,7 @@
  116. unsigned char *kstr, int klen, pem_password_cb *cb, \
  117. void *u) \
  118. { \
  119. - 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)); \
  120. +return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,enc,kstr,klen,cb,u)); \
  121. }
  123. #define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
  124. @@ -248,7 +249,7 @@
  125. unsigned char *kstr, int klen, pem_password_cb *cb, \
  126. void *u) \
  127. { \
  128. - 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)); \
  129. +return(PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(char *)x,enc,kstr,klen,cb,u)); \
  130. }
  132. #endif
  133. @@ -256,33 +257,34 @@
  134. #define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
  135. type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
  136. { \
  137. -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)); \
  138. +return((type *)PEM_ASN1_read_bio( \
  139. + (d2i_of_void *)d2i_##asn1,str,bp,(void **)x,cb,u)); \
  140. }
  142. #define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
  143. int PEM_write_bio_##name(BIO *bp, type *x) \
  144. { \
  145. -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)); \
  146. +return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,NULL,NULL,0,NULL,NULL)); \
  147. }
  149. #define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
  150. int PEM_write_bio_##name(BIO *bp, const type *x) \
  151. { \
  152. -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)); \
  153. +return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,NULL,NULL,0,NULL,NULL)); \
  154. }
  156. #define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
  157. int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
  158. unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
  159. { \
  160. - 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)); \
  161. +return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,enc,kstr,klen,cb,u)); \
  162. }
  164. #define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
  165. int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
  166. unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
  167. { \
  168. - 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)); \
  169. +return(PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(char *)x,enc,kstr,klen,cb,u)); \
  170. }
  172. #define IMPLEMENT_PEM_write(name, type, str, asn1) \
  173. @@ -546,12 +548,12 @@
  174. void * PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp,
  175. void **x, pem_password_cb *cb, void *u);
  176. #define PEM_ASN1_read_bio_of(type,d2i,name,bp,x,cb,u) \
  177. -((type *(*)(D2I_OF(type),const char *,BIO *,type **,pem_password_cb *,void *))openssl_fcast(PEM_ASN1_read_bio))(d2i,name,bp,x,cb,u)
  178. +((type *)PEM_ASN1_read_bio((d2i_of_void *)d2i,name,bp,(void **)x,cb,u))
  179. int PEM_ASN1_write_bio(i2d_of_void *i2d,const char *name,BIO *bp,char *x,
  180. const EVP_CIPHER *enc,unsigned char *kstr,int klen,
  181. pem_password_cb *cb, void *u);
  182. #define PEM_ASN1_write_bio_of(type,i2d,name,bp,x,enc,kstr,klen,cb,u) \
  183. - ((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)
  184. + (PEM_ASN1_write_bio)((i2d_of_void *)i2d,name,bp,(char *)x,enc,kstr,klen,cb,u)
  186. STACK_OF(X509_INFO) * PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u);
  187. int PEM_X509_INFO_write_bio(BIO *bp,X509_INFO *xi, EVP_CIPHER *enc,