Use the passed buffer in ERR_error_string!

[oweals/openssl.git] / crypto / asn1 / x_x509.c

diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index ee3213045ed2cd23a279474d634c877c16a8f40f..36f0e4743eefd098e72f18b79bc251b6de834960 100644 (file)
--- a/crypto/asn1/x_x509.c
+++ b/crypto/asn1/x_x509.c
@@ -63,7 +63,7 @@
 #include <openssl/x509.h>
 
 static int x509_meth_num = 0;
-static STACK *x509_meth = NULL;
+static STACK_OF(CRYPTO_EX_DATA_FUNCS) *x509_meth = NULL;
 
 static ASN1_METHOD meth={
        (int (*)())  i2d_X509,
@@ -102,7 +102,7 @@ X509 *d2i_X509(X509 **a, unsigned char **pp, long length)
        M_ASN1_D2I_get(ret->cert_info,d2i_X509_CINF);
        M_ASN1_D2I_get(ret->sig_alg,d2i_X509_ALGOR);
        M_ASN1_D2I_get(ret->signature,d2i_ASN1_BIT_STRING);
-       if (ret->name != NULL) Free(ret->name);
+       if (ret->name != NULL) OPENSSL_free(ret->name);
        ret->name=X509_NAME_oneline(ret->cert_info->subject,NULL,0);
 
        M_ASN1_D2I_Finish(a,X509_free,ASN1_F_D2I_X509);
@@ -117,12 +117,13 @@ X509 *X509_new(void)
        ret->references=1;
        ret->valid=0;
        ret->ex_flags = 0;
+       ret->ex_pathlen = -1;
        ret->name=NULL;
        ret->aux=NULL;
        M_ASN1_New(ret->cert_info,X509_CINF_new);
        M_ASN1_New(ret->sig_alg,X509_ALGOR_new);
        M_ASN1_New(ret->signature,M_ASN1_BIT_STRING_new);
-       CRYPTO_new_ex_data(x509_meth, (char *)ret, &ret->ex_data);
+       CRYPTO_new_ex_data(x509_meth, ret, &ret->ex_data);
        return(ret);
        M_ASN1_New_Error(ASN1_F_X509_NEW);
        }
@@ -146,30 +147,30 @@ void X509_free(X509 *a)
                }
 #endif
 
-       CRYPTO_free_ex_data(x509_meth,(char *)a,&a->ex_data);
+       CRYPTO_free_ex_data(x509_meth,a,&a->ex_data);
        X509_CINF_free(a->cert_info);
        X509_ALGOR_free(a->sig_alg);
        M_ASN1_BIT_STRING_free(a->signature);
        X509_CERT_AUX_free(a->aux);
 
-       if (a->name != NULL) Free(a->name);
-       Free((char *)a);
+       if (a->name != NULL) OPENSSL_free(a->name);
+       OPENSSL_free(a);
        }
 
-int X509_get_ex_new_index(long argl, char *argp, int (*new_func)(),
-            int (*dup_func)(), void (*free_func)())
+int X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
+            CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
         {
        x509_meth_num++;
        return(CRYPTO_get_ex_new_index(x509_meth_num-1,
                &x509_meth,argl,argp,new_func,dup_func,free_func));
         }
 
-int X509_set_ex_data(X509 *r, int idx, char *arg)
+int X509_set_ex_data(X509 *r, int idx, void *arg)
        {
        return(CRYPTO_set_ex_data(&r->ex_data,idx,arg));
        }
 
-char *X509_get_ex_data(X509 *r, int idx)
+void *X509_get_ex_data(X509 *r, int idx)
        {
        return(CRYPTO_get_ex_data(&r->ex_data,idx));
        }