More X509_ATTRIBUTE changes.

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

diff --git a/crypto/asn1/p7_lib.c b/crypto/asn1/p7_lib.c
index 52cfb93c72519f4d3d1b74cb66db144479c84734..d3e596dab3ee325a63c76e6b7a257561f85c3df1 100644 (file)
--- a/crypto/asn1/p7_lib.c
+++ b/crypto/asn1/p7_lib.c
@@ -59,13 +59,9 @@
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/asn1_mac.h>
+#include <openssl/pkcs7.h>
 #include <openssl/objects.h>
 
-/* ASN1err(ASN1_F_D2I_PKCS7,ASN1_R_BAD_PKCS7_CONTENT);
- * ASN1err(ASN1_F_I2D_PKCS7,ASN1_R_BAD_PKCS7_TYPE);
- * ASN1err(ASN1_F_PKCS7_NEW,ASN1_R_BAD_PKCS7_TYPE);
- */
-
 int i2d_PKCS7(PKCS7 *a, unsigned char **pp)
        {
        M_ASN1_I2D_vars(a);
@@ -272,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);