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 f5931f762383c9bc9cd229e7f3da5a1941d6c986..fbfd963b4063900686d83fa98fdf0c75134614a9 100644 (file)
--- a/crypto/asn1/x_exten.c
+++ b/crypto/asn1/x_exten.c
@@ -122,7 +122,7 @@ 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;
        return(ret);
@@ -133,7 +133,7 @@ void X509_EXTENSION_free(X509_EXTENSION *a)
        {
        if (a == NULL) return;
        ASN1_OBJECT_free(a->object);
-       ASN1_OCTET_STRING_free(a->value);
-       Free((char *)a);
+       M_ASN1_OCTET_STRING_free(a->value);
+       OPENSSL_free(a);
        }