- outdated

Changed files:
    openssl-CVE-2007-3108.patch -> 1.2
    openssl-gcc_4_2.patch -> 1.5

diff --git a/openssl-CVE-2007-3108.patch b/openssl-CVE-2007-3108.patch
deleted file mode 100644 (file)
index abf0196..0000000
--- a/openssl-CVE-2007-3108.patch
+++ /dev/null
@@ -1,126 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-- --- openssl-0.9.8e/crypto/bn/bn_mont.c       2006-06-16 03:01:14.000000000 +0200
-+++ openssl-0.9.8-cvs/crypto/bn/bn_mont.c      2007-06-29 10:13:25.000000000 +0200
-@@ -176,7 +176,6 @@
- 
-       max=(nl+al+1); /* allow for overflow (no?) XXX */
-       if (bn_wexpand(r,max) == NULL) goto err;
-- -    if (bn_wexpand(ret,max) == NULL) goto err;
- 
-       r->neg=a->neg^n->neg;
-       np=n->d;
-@@ -228,19 +227,70 @@
-               }
-       bn_correct_top(r);
-       
-- -    /* mont->ri will be a multiple of the word size */
-- -#if 0
-- -    BN_rshift(ret,r,mont->ri);
-- -#else
-- -    ret->neg = r->neg;
-- -    x=ri;
-+      /* mont->ri will be a multiple of the word size and below code
-+       * is kind of BN_rshift(ret,r,mont->ri) equivalent */
-+      if (r->top <= ri)
-+              {
-+              ret->top=0;
-+              retn=1;
-+              goto err;
-+              }
-+      al=r->top-ri;
-+
-+# define BRANCH_FREE 1
-+# if BRANCH_FREE
-+      if (bn_wexpand(ret,ri) == NULL) goto err;
-+      x=0-(((al-ri)>>(sizeof(al)*8-1))&1);
-+      ret->top=x=(ri&~x)|(al&x);      /* min(ri,al) */
-+      ret->neg=r->neg;
-+
-       rp=ret->d;
-- -    ap= &(r->d[x]);
-- -    if (r->top < x)
-- -            al=0;
-- -    else
-- -            al=r->top-x;
-+      ap=&(r->d[ri]);
-+
-+      {
-+      size_t m1,m2;
-+
-+      v=bn_sub_words(rp,ap,np,ri);
-+      /* this ----------------^^ works even in al<ri case
-+       * thanks to zealous zeroing of top of the vector in the
-+       * beginning. */
-+
-+      /* if (al==ri && !v) || al>ri) nrp=rp; else nrp=ap; */
-+      /* in other words if subtraction result is real, then
-+       * trick unconditional memcpy below to perform in-place
-+       * "refresh" instead of actual copy. */
-+      m1=0-(size_t)(((al-ri)>>(sizeof(al)*8-1))&1);   /* al<ri */
-+      m2=0-(size_t)(((ri-al)>>(sizeof(al)*8-1))&1);   /* al>ri */
-+      m1|=m2;                 /* (al!=ri) */
-+      m1|=(0-(size_t)v);      /* (al!=ri || v) */
-+      m1&=~m2;                /* (al!=ri || v) && !al>ri */
-+      nrp=(BN_ULONG *)(((size_t)rp&~m1)|((size_t)ap&m1));
-+      }
-+
-+      /* 'i<ri' is chosen to eliminate dependency on input data, even
-+       * though it results in redundant copy in al<ri case. */
-+      for (i=0,ri-=4; i<ri; i+=4)
-+              {
-+              BN_ULONG t1,t2,t3,t4;
-+              
-+              t1=nrp[i+0];
-+              t2=nrp[i+1];
-+              t3=nrp[i+2];    ap[i+0]=0;
-+              t4=nrp[i+3];    ap[i+1]=0;
-+              rp[i+0]=t1;     ap[i+2]=0;
-+              rp[i+1]=t2;     ap[i+3]=0;
-+              rp[i+2]=t3;
-+              rp[i+3]=t4;
-+              }
-+      for (ri+=4; i<ri; i++)
-+              rp[i]=nrp[i], ap[i]=0;
-+# else
-+      if (bn_wexpand(ret,al) == NULL) goto err;
-       ret->top=al;
-+      ret->neg=r->neg;
-+
-+      rp=ret->d;
-+      ap=&(r->d[ri]);
-       al-=4;
-       for (i=0; i<al; i+=4)
-               {
-@@ -258,7 +308,7 @@
-       al+=4;
-       for (; i<al; i++)
-               rp[i]=ap[i];
-- -#endif
-+# endif
- #else /* !MONT_WORD */ 
-       BIGNUM *t1,*t2;
- 
-@@ -278,10 +328,12 @@
-       if (!BN_rshift(ret,t2,mont->ri)) goto err;
- #endif /* MONT_WORD */
- 
-+#if !defined(BRANCH_FREE) || BRANCH_FREE==0
-       if (BN_ucmp(ret, &(mont->N)) >= 0)
-               {
-               if (!BN_usub(ret,ret,&(mont->N))) goto err;
-               }
-+#endif
-       retn=1;
-       bn_check_top(ret);
-  err:
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iQCVAwUBRrGk++6tTP1JpWPZAQJbjwP/W/6mROtxOVU1gvvq/uFHCytNWHVaJfKA
-7zh+v4OPQEIYekIBkEpNFgTJbHcyIZoyDNnwOetkRXvI4LDqvV1V5/pA5bzrKqDj
-zv7Hj8R7DGqG8ad0Esf3l7SqqirI3curkIzm5/cALJBJxz/Pp7qyXNzzQgp55UPz
-iBDdynBpa+s=
-=aquq
------END PGP SIGNATURE-----

diff --git a/openssl-gcc_4_2.patch b/openssl-gcc_4_2.patch
deleted file mode 100644 (file)
index 13a237b..0000000
--- a/openssl-gcc_4_2.patch
+++ /dev/null
@@ -1,291 +0,0 @@
---- openssl-0.9.8e/crypto/asn1/asn1.h.gcc42~   2006-02-19 14:45:22.000000000 +0100
-+++ openssl-0.9.8e/crypto/asn1/asn1.h  2007-03-04 12:35:59.000000000 +0100
-@@ -902,23 +902,26 @@
- 
- /* 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 *))openssl_fcast(ASN1_dup))(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 *))openssl_fcast(ASN1_dup))(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 **))openssl_fcast(ASN1_d2i_fp))(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 *))openssl_fcast(ASN1_i2d_fp))(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 *))openssl_fcast(ASN1_i2d_fp))(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
-@@ -927,14 +930,16 @@
- 
- #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 **))openssl_fcast(ASN1_d2i_bio))(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 *))openssl_fcast(ASN1_i2d_bio))(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 *))openssl_fcast(ASN1_i2d_bio))(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);
-@@ -977,8 +982,9 @@
- 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 **))openssl_fcast(ASN1_pack_string))(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);
---- openssl-0.9.8e/crypto/ocsp/ocsp.h.gcc42~   2005-05-13 01:01:43.000000000 +0200
-+++ openssl-0.9.8e/crypto/ocsp/ocsp.h  2007-03-04 12:35:59.000000000 +0100
-@@ -468,8 +468,9 @@
- 
- ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
-                               void *data, STACK_OF(ASN1_OBJECT) *sk);
-+extern const void *__ASN1_STRING_encode;
- #define ASN1_STRING_encode_of(type,s,i2d,data,sk) \
--((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))openssl_fcast(ASN1_STRING_encode))(s,i2d,data,sk)
-+((ASN1_STRING *(*)(ASN1_STRING *,I2D_OF(type),type *,STACK_OF(ASN1_OBJECT) *))__ASN1_STRING_encode)(s,i2d,data,sk)
- 
- X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);
- 
---- openssl-0.9.8e/crypto/pem/pem.h.gcc42~     2006-12-19 20:47:36.000000000 +0100
-+++ openssl-0.9.8e/crypto/pem/pem.h    2007-03-04 12:44:19.000000000 +0100
-@@ -220,19 +220,19 @@
- #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 *))openssl_fcast(PEM_ASN1_read))(d2i_##asn1, str,fp,x,cb,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 *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
-+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 *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL)); \
-+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) \
-@@ -240,7 +243,7 @@
-            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 *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,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) \
-@@ -248,7 +252,7 @@
-            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 *))openssl_fcast(PEM_ASN1_write))(i2d_##asn1,str,fp,x,enc,kstr,klen,cb,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
-@@ -256,33 +261,33 @@
- #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 *))openssl_fcast(PEM_ASN1_read_bio))(d2i_##asn1, str,bp,x,cb,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 *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \
-+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 *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL)); \
-+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 *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,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 *))openssl_fcast(PEM_ASN1_write_bio))(i2d_##asn1,str,bp,x,enc,kstr,klen,cb,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) \
-@@ -545,13 +555,15 @@
-            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 *))openssl_fcast(PEM_ASN1_read_bio))(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 *))openssl_fcast(PEM_ASN1_write_bio))(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,
-@@ -566,11 +566,13 @@
- 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,
---- openssl-0.9.8e/crypto/asn1/a_d2i_fp.c.ark  2007-04-17 17:50:28.000000000 +0000
-+++ openssl-0.9.8e/crypto/asn1/a_d2i_fp.c      2007-04-17 19:17:24.000000000 +0000
-@@ -81,6 +81,7 @@
-         BIO_free(b);
-         return(ret);
-         }
-+const void * __attribute__((unused)) __ASN1_d2i_fp=(const void*)openssl_fcast(ASN1_d2i_fp);
- #endif
- 
- void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x)
-@@ -99,6 +100,7 @@
-       if (b != NULL) BUF_MEM_free(b);
-       return(ret);
-       }
-+const void * __attribute__((unused)) __ASN1_d2i_bio=(const void*)openssl_fcast(ASN1_d2i_bio);
- 
- #endif
- 
---- openssl-0.9.8e/crypto/asn1/a_dup.c.ark     2007-04-17 17:49:31.000000000 +0000
-+++ openssl-0.9.8e/crypto/asn1/a_dup.c 2007-04-17 17:49:59.000000000 +0000
-@@ -82,6 +82,7 @@
-       OPENSSL_free(b);
-       return(ret);
-       }
-+const void * __attribute__((unused)) __ASN1_dup=(const void*)openssl_fcast(ASN1_dup);
- 
- #endif
- 
---- openssl-0.9.8e/crypto/asn1/a_i2d_fp.c.ark  2007-04-17 17:52:19.000000000 +0000
-+++ openssl-0.9.8e/crypto/asn1/a_i2d_fp.c      2007-04-17 19:19:29.000000000 +0000
-@@ -79,6 +79,7 @@
-         BIO_free(b);
-         return(ret);
-         }
-+const void * __attribute__((unused)) __ASN1_i2d_fp=(const void*)openssl_fcast(ASN1_i2d_fp);
- #endif
- 
- int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x)
-@@ -113,6 +114,7 @@
-       OPENSSL_free(b);
-       return(ret);
-       }
-+const void * __attribute__((unused)) __ASN1_i2d_bio=(const void*)openssl_fcast(ASN1_i2d_bio);
- 
- #endif
- 
---- openssl-0.9.8e/crypto/asn1/asn_pack.c.ark  2007-04-17 19:18:35.000000000 +0000
-+++ openssl-0.9.8e/crypto/asn1/asn_pack.c      2007-04-17 19:19:20.000000000 +0000
-@@ -144,6 +144,7 @@
-       i2d (obj, &p);
-       return octmp;
- }
-+const void * __attribute__((unused)) __ASN1_pack_string=(const void*)openssl_fcast(ASN1_pack_string);
- 
- #endif
- 
---- openssl-0.9.8e/crypto/ocsp/ocsp_ext.c.ark  2007-04-17 19:20:35.000000000 +0000
-+++ openssl-0.9.8e/crypto/ocsp/ocsp_ext.c      2007-04-17 19:21:19.000000000 +0000
-@@ -305,6 +305,7 @@
-       if (b) OPENSSL_free(b);
-       return NULL;
-       }
-+const void * __attribute__((unused)) __ASN1_STRING_encode=(const void*)openssl_fcast(ASN1_STRING_encode);
- 
- /* Nonce handling functions */
- 
---- openssl-0.9.8e/crypto/pem/pem_lib.c.ark    2007-04-17 19:21:44.000000000 +0000
-+++ openssl-0.9.8e/crypto/pem/pem_lib.c        2007-04-17 19:26:35.000000000 +0000
-@@ -174,6 +174,7 @@
-         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)
-@@ -277,6 +278,7 @@
-         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,
-@@ -381,6 +383,7 @@
-               }
-       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)
---- openssl-0.9.8e/crypto/pem/pem_oth.c.ark    2007-04-17 19:27:10.000000000 +0000
-+++ openssl-0.9.8e/crypto/pem/pem_oth.c        2007-04-17 19:30:00.000000000 +0000
-@@ -84,3 +84,4 @@
-       OPENSSL_free(data);
-       return(ret);
-       }
-+const void * __attribute__((unused)) __PEM_ASN1_read_bio=(const void*)openssl_fcast(PEM_ASN1_read_bio);