Add -clrext option to 'x509'

[openssl.git] / crypto / pkcs12 / p12_bags.c

diff --git a/crypto/pkcs12/p12_bags.c b/crypto/pkcs12/p12_bags.c
index 9a31502e352e6b82b32b6587cea6aa7610efb45e..c358b0673553abb327c3919a42b8daf9bdc867d5 100644 (file)
--- a/crypto/pkcs12/p12_bags.c
+++ b/crypto/pkcs12/p12_bags.c
@@ -58,13 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1_mac.h"
-#include "pkcs12.h"
-
-/*
- *ASN1err(ASN1_F_PKCS12_BAGS_NEW,ASN1_R_DECODE_ERROR)
- *ASN1err(ASN1_F_D2I_PKCS12_BAGS,ASN1_R_DECODE_ERROR)
- */
+#include <openssl/asn1_mac.h>
+#include <openssl/pkcs12.h>
 
 int i2d_PKCS12_BAGS(PKCS12_BAGS *a, unsigned char **pp)
 {
@@ -176,15 +171,15 @@ void PKCS12_BAGS_free (PKCS12_BAGS *a)
        switch (OBJ_obj2nid(a->type)) {
 
                case NID_x509Certificate:
-                       ASN1_OCTET_STRING_free (a->value.x509cert);
+                       M_ASN1_OCTET_STRING_free (a->value.x509cert);
                break;
 
                case NID_x509Crl:
-                       ASN1_OCTET_STRING_free (a->value.x509crl);
+                       M_ASN1_OCTET_STRING_free (a->value.x509crl);
                break;
 
                case NID_sdsiCertificate:
-                       ASN1_IA5STRING_free (a->value.sdsicert);
+                       M_ASN1_IA5STRING_free (a->value.sdsicert);
                break;
 
                default:
@@ -193,5 +188,5 @@ void PKCS12_BAGS_free (PKCS12_BAGS *a)
        }
 
        ASN1_OBJECT_free (a->type);
-       Free ((char *)a);
+       Free (a);
 }