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 38729b6d1cd2861e5b33ac9c6f0c8e498e8f8227..c358b0673553abb327c3919a42b8daf9bdc867d5 100644 (file)
--- a/crypto/pkcs12/p12_bags.c
+++ b/crypto/pkcs12/p12_bags.c
@@ -58,17 +58,10 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1_mac.h"
-#include "pkcs12.h"
+#include <openssl/asn1_mac.h>
+#include <openssl/pkcs12.h>
 
-/*
- *ASN1err(ASN1_F_PKCS12_BAGS_NEW,ASN1_R_DECODE_ERROR)
- *ASN1err(ASN1_F_D2I_PKCS12_BAGS,ASN1_R_DECODE_ERROR)
- */
-
-int i2d_PKCS12_BAGS(a,pp)
-PKCS12_BAGS *a;
-unsigned char **pp;
+int i2d_PKCS12_BAGS(PKCS12_BAGS *a, unsigned char **pp)
 {
        int bagnid, v = 0;
        M_ASN1_I2D_vars(a);
@@ -126,7 +119,7 @@ unsigned char **pp;
        M_ASN1_I2D_finish();
 }
 
-PKCS12_BAGS *PKCS12_BAGS_new()
+PKCS12_BAGS *PKCS12_BAGS_new(void)
 {
        PKCS12_BAGS *ret=NULL;
        ASN1_CTX c;
@@ -137,10 +130,8 @@ PKCS12_BAGS *PKCS12_BAGS_new()
        M_ASN1_New_Error(ASN1_F_PKCS12_BAGS_NEW);
 }
 
-PKCS12_BAGS *d2i_PKCS12_BAGS(a,pp,length)
-PKCS12_BAGS **a;
-unsigned char **pp;
-long length;
+PKCS12_BAGS *d2i_PKCS12_BAGS(PKCS12_BAGS **a, unsigned char **pp,
+            long length)
 {
        int bagnid;
        M_ASN1_D2I_vars(a,PKCS12_BAGS *,PKCS12_BAGS_new);
@@ -174,22 +165,21 @@ long length;
        M_ASN1_D2I_Finish(a, PKCS12_BAGS_free, ASN1_F_D2I_PKCS12_BAGS);
 }
 
-void PKCS12_BAGS_free (a)
-PKCS12_BAGS *a;
+void PKCS12_BAGS_free (PKCS12_BAGS *a)
 {
        if (a == NULL) return;
        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:
@@ -198,5 +188,5 @@ PKCS12_BAGS *a;
        }
 
        ASN1_OBJECT_free (a->type);
-       Free ((char *)a);
+       Free (a);
 }