Fixes for Win32 build.

[openssl.git] / crypto / asn1 / p7_lib.c

diff --git a/crypto/asn1/p7_lib.c b/crypto/asn1/p7_lib.c
index 846be171588a8d2423499509ab56c5792137f229..90ead17dbc756a6bf719eb7de035fda40e8418a7 100644 (file)
--- a/crypto/asn1/p7_lib.c
+++ b/crypto/asn1/p7_lib.c
@@ -152,7 +152,7 @@ PKCS7 *d2i_PKCS7(PKCS7 **a, unsigned char **pp, long length)
                {
                if ((*a)->asn1 != NULL)
                        {
-                       Free((char *)(*a)->asn1);
+                       OPENSSL_free((*a)->asn1);
                        (*a)->asn1=NULL;
                        }
                (*a)->length=0;
@@ -251,7 +251,7 @@ void PKCS7_free(PKCS7 *a)
                {
                ASN1_OBJECT_free(a->type);
                }
-       Free((char *)(char *)a);
+       OPENSSL_free(a);
        }
 
 void PKCS7_content_free(PKCS7 *a)
@@ -259,7 +259,7 @@ void PKCS7_content_free(PKCS7 *a)
        if(a == NULL)
            return;
 
-       if (a->asn1 != NULL) Free((char *)a->asn1);
+       if (a->asn1 != NULL) OPENSSL_free(a->asn1);
 
        if (a->d.ptr != NULL)
                {
@@ -268,7 +268,7 @@ void PKCS7_content_free(PKCS7 *a)
                switch (OBJ_obj2nid(a->type))
                        {
                case NID_pkcs7_data:
-                       ASN1_OCTET_STRING_free(a->d.data);
+                       M_ASN1_OCTET_STRING_free(a->d.data);
                        break;
                case NID_pkcs7_signed:
                        PKCS7_SIGNED_free(a->d.sign);
@@ -293,3 +293,5 @@ void PKCS7_content_free(PKCS7 *a)
        a->d.ptr=NULL;
        }
 
+IMPLEMENT_STACK_OF(PKCS7)
+IMPLEMENT_ASN1_SET_OF(PKCS7)