xca-openssl.patch

   1 diff -urNp xca-0.5.1.org/lib/asn1time.cpp xca-0.5.1/lib/asn1time.cpp
   2 --- xca-0.5.1.org/lib/asn1time.cpp      2003-12-14 21:11:33.000000000 +0200
   3 +++ xca-0.5.1/lib/asn1time.cpp  2006-09-24 22:22:29.000000000 +0300
   4 @@ -250,7 +250,7 @@ unsigned char *a1time::d2i(unsigned char
   5         unsigned char *mp = p;
   6         if (time)
   7                 ASN1_TIME_free(time);
   8 -       time = d2i_ASN1_TIME(NULL, &mp, size);
   9 +       time = d2i_ASN1_TIME(NULL, (const unsigned char **)&mp, size);
  10         return mp;
  11  }
  12
  13 diff -urNp xca-0.5.1.org/lib/pki_crl.cpp xca-0.5.1/lib/pki_crl.cpp
  14 --- xca-0.5.1.org/lib/pki_crl.cpp       2004-04-20 00:19:35.000000000 +0300
  15 +++ xca-0.5.1/lib/pki_crl.cpp   2006-09-24 22:49:05.000000000 +0300
  16 @@ -131,7 +131,7 @@ pki_crl::~pki_crl()
  17  void pki_crl::fromData(unsigned char *p, int size)
  18  {
  19         X509_CRL *crl_sik = crl;
  20 -       crl = d2i_X509_CRL(NULL, &p, size);
  21 +       crl = d2i_X509_CRL(NULL, (const unsigned char **)&p, size);
  22         if (crl)
  23                 X509_CRL_free(crl_sik);
  24         else
  25 diff -urNp xca-0.5.1.org/lib/pki_key.cpp xca-0.5.1/lib/pki_key.cpp
  26 --- xca-0.5.1.org/lib/pki_key.cpp       2004-02-18 02:03:06.000000000 +0200
  27 +++ xca-0.5.1/lib/pki_key.cpp   2006-09-24 22:58:03.000000000 +0300
  28 @@ -107,7 +107,7 @@ pki_key::pki_key(const pki_key *pk)
  29         if (pk == NULL) return;
  30         key->type = pk->key->type;
  31         if (key->type == EVP_PKEY_RSA) {
  32 -               key->pkey.rsa=((RSA *)ASN1_dup( (int (*)())i2d_RSAPrivateKey, (char *(*)())d2i_RSAPrivateKey,(char *)pk->key->pkey.rsa));
  33 +               key->pkey.rsa=ASN1_dup_of_const(RSA, i2d_RSAPrivateKey, d2i_RSAPrivateKey, pk->key->pkey.rsa);
  34         }
  35         // TODO add DSA support.....
  36         openssl_error();
  37 @@ -216,7 +216,7 @@ void pki_key::fromData(unsigned char *p,
  38                 rsakey = d2i_RSAPrivateKey(NULL, &pdec, decsize);
  39  #endif
  40                 if (ign_openssl_error()) {
  41 -                       rsakey = d2i_RSA_PUBKEY(NULL, &sik, decsize);
  42 +                       rsakey = d2i_RSA_PUBKEY(NULL, (const unsigned char **)&sik, decsize);
  43                 }
  44                 openssl_error();
  45                 if (rsakey) EVP_PKEY_assign_RSA(key, rsakey);
  46 diff -urNp xca-0.5.1.org/lib/pki_x509.cpp xca-0.5.1/lib/pki_x509.cpp
  47 --- xca-0.5.1.org/lib/pki_x509.cpp      2004-02-18 02:03:06.000000000 +0200
  48 +++ xca-0.5.1/lib/pki_x509.cpp  2006-09-24 22:24:30.000000000 +0300
  49 @@ -276,7 +276,7 @@ void pki_x509::fromData(unsigned char *p
  50         version = intFromData(&p1);
  51         if (version >=1 || version <= 4) {
  52                 sCert = intFromData(&p1);
  53 -               cert = d2i_X509(NULL, &p1, sCert);
  54 +               cert = d2i_X509(NULL, (const unsigned char **)&p1, sCert);
  55                 trust = intFromData(&p1);
  56                 sRev = intFromData(&p1);
  57                 if (sRev) {
  58 @@ -314,7 +314,7 @@ void pki_x509::fromData(unsigned char *p
  59                 // version 3 did save a recent date :-((
  60         }
  61         else { // old version
  62 -               cert = d2i_X509(NULL, &p, size);
  63 +               cert = d2i_X509(NULL, (const unsigned char **)&p, size);
  64                 revoked = NULL;
  65                 trust = 1;
  66                 efftrust = 1;
  67 diff -urNp xca-0.5.1.org/lib/pki_x509req.cpp xca-0.5.1/lib/pki_x509req.cpp
  68 --- xca-0.5.1.org/lib/pki_x509req.cpp   2004-02-05 22:17:55.000000000 +0200
  69 +++ xca-0.5.1/lib/pki_x509req.cpp       2006-09-24 22:51:19.000000000 +0300
  70 @@ -134,9 +134,9 @@ void pki_x509req::fromData(unsigned char
  71  {
  72         unsigned char *ps = p;
  73         privkey = NULL;
  74 -       request = d2i_X509_REQ(&request, &ps, size);
  75 +       request = d2i_X509_REQ(&request, (const unsigned char **)&ps, size);
  76         if (ps - p < size)
  77 -               spki = d2i_NETSCAPE_SPKI(NULL, &ps , size + p - ps);
  78 +               spki = d2i_NETSCAPE_SPKI(NULL, (const unsigned char **)&ps , size + p - ps);
  79         openssl_error();
  80  }
  81
  82 @@ -257,7 +257,7 @@ void pki_x509req::setSPKIFromData(unsign
  83  {
  84         NETSCAPE_SPKI *spki = NULL;
  85
  86 -       spki = d2i_NETSCAPE_SPKI(NULL,&p,size);
  87 +       spki = d2i_NETSCAPE_SPKI(NULL,(const unsigned char **)&p,size);
  88         if (spki == NULL) goto err;
  89
  90         set_spki (spki);
  91 diff -urNp xca-0.5.1.org/lib/x509name.cpp xca-0.5.1/lib/x509name.cpp
  92 --- xca-0.5.1.org/lib/x509name.cpp      2003-12-12 01:41:09.000000000 +0200
  93 +++ xca-0.5.1/lib/x509name.cpp  2006-09-24 22:58:52.000000000 +0300
  94 @@ -149,7 +149,7 @@ unsigned char *x509name::d2i(unsigned ch
  95  {
  96         unsigned char *mp = p;
  97         X509_NAME *xn_sik = xn;
  98 -       xn = d2i_X509_NAME(NULL, &mp, size);
  99 +       xn = d2i_X509_NAME(NULL, (const unsigned char **)&mp, size);
 100         if (xn == NULL)
 101                 xn = xn_sik;
 102         else
 103 diff -urNp xca-0.5.1.org/lib/x509rev.cpp xca-0.5.1/lib/x509rev.cpp
 104 --- xca-0.5.1.org/lib/x509rev.cpp       2003-11-24 15:42:44.000000000 +0200
 105 +++ xca-0.5.1/lib/x509rev.cpp   2006-09-24 22:20:09.000000000 +0300
 106 @@ -50,9 +50,8 @@
 107
 108  #include "x509rev.h"
 109
 110 -#define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
 111 -               (char *(*)())d2i_X509_REVOKED,(char *)x5r)
 112 -
 113 +#define X509_REVOKED_dup(x5r) ASN1_dup_of (X509_REVOKED, i2d_X509_REVOKED, d2i_X509_REVOKED, x5r)
 114 +
 115  x509rev::x509rev()
 116  {
 117         rev = X509_REVOKED_new();