Various fixes...

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

diff --git a/crypto/asn1/x_exten.c b/crypto/asn1/x_exten.c
index d5f9e1df9e0e3e55921b31fd0f25e39c80c42588..fbfd963b4063900686d83fa98fdf0c75134614a9 100644 (file)
--- a/crypto/asn1/x_exten.c
+++ b/crypto/asn1/x_exten.c
@@ -100,10 +100,6 @@ X509_EXTENSION *d2i_X509_EXTENSION(X509_EXTENSION **a, unsigned char **pp,
        M_ASN1_D2I_start_sequence();
        M_ASN1_D2I_get(ret->object,d2i_ASN1_OBJECT);
 
-       if ((ret->argp != NULL) && (ret->ex_free != NULL))
-               ret->ex_free(ret);
-       ret->argl=0;
-       ret->argp=NULL;
        ret->netscape_hack=0;
        if ((c.slen != 0) &&
                (M_ASN1_next == (V_ASN1_UNIVERSAL|V_ASN1_BOOLEAN)))
@@ -126,12 +122,9 @@ X509_EXTENSION *X509_EXTENSION_new(void)
 
        M_ASN1_New_Malloc(ret,X509_EXTENSION);
        ret->object=OBJ_nid2obj(NID_undef);
-       M_ASN1_New(ret->value,ASN1_OCTET_STRING_new);
+       M_ASN1_New(ret->value,M_ASN1_OCTET_STRING_new);
        ret->critical=0;
        ret->netscape_hack=0;
-       ret->argl=0L;
-       ret->argp=NULL;
-       ret->ex_free=NULL;
        return(ret);
        M_ASN1_New_Error(ASN1_F_X509_EXTENSION_NEW);
        }
@@ -139,10 +132,8 @@ X509_EXTENSION *X509_EXTENSION_new(void)
 void X509_EXTENSION_free(X509_EXTENSION *a)
        {
        if (a == NULL) return;
-       if ((a->argp != NULL) && (a->ex_free != NULL))
-               a->ex_free(a);
        ASN1_OBJECT_free(a->object);
-       ASN1_OCTET_STRING_free(a->value);
-       Free((char *)a);
+       M_ASN1_OCTET_STRING_free(a->value);
+       OPENSSL_free(a);
        }