Add support for dynamically created and destroyed mutexes. This will

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

diff --git a/crypto/pkcs12/p12_sbag.c b/crypto/pkcs12/p12_sbag.c
index d39ffe4ff9a1f5b9e66e0541fdfdab8ca71a38b8..64ac32ee6fdb8698d13d8921f78e61f91095f438 100644 (file)
--- a/crypto/pkcs12/p12_sbag.c
+++ b/crypto/pkcs12/p12_sbag.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_SAFEBAG_NEW,ASN1_R_DECODE_ERROR)
- *ASN1err(ASN1_F_D2I_PKCS12_SAFEBAG,ASN1_R_DECODE_ERROR)
- */
-
-int i2d_PKCS12_SAFEBAG(a,pp)
-PKCS12_SAFEBAG *a;
-unsigned char **pp;
+int i2d_PKCS12_SAFEBAG(PKCS12_SAFEBAG *a, unsigned char **pp)
 {
        int bagnid, v = 0;
        M_ASN1_I2D_vars(a);
@@ -88,8 +81,9 @@ unsigned char **pp;
                break;
 
                case NID_safeContentsBag:
-                       M_ASN1_I2D_len_EXP_SEQUENCE_opt (a->value.safes,
-                                i2d_PKCS12_SAFEBAG, 0, V_ASN1_SEQUENCE, v);
+                       M_ASN1_I2D_len_EXP_SEQUENCE_opt_type
+                         (PKCS12_SAFEBAG, a->value.safes, i2d_PKCS12_SAFEBAG,
+                          0, V_ASN1_SEQUENCE, v);
                break;
 
                case NID_certBag:
@@ -105,7 +99,7 @@ unsigned char **pp;
                break;
        }
 
-       M_ASN1_I2D_len_SET (a->attrib, i2d_X509_ATTRIBUTE);
+       M_ASN1_I2D_len_SET_type (X509_ATTRIBUTE,a->attrib, i2d_X509_ATTRIBUTE);
 
        M_ASN1_I2D_seq_total ();
        
@@ -124,8 +118,9 @@ unsigned char **pp;
                break;
 
                case NID_safeContentsBag:
-                       M_ASN1_I2D_put_EXP_SEQUENCE_opt (a->value.safes,
-                                i2d_PKCS12_SAFEBAG, 0, V_ASN1_SEQUENCE, v);
+                       M_ASN1_I2D_put_EXP_SEQUENCE_opt_type
+                         (PKCS12_SAFEBAG, a->value.safes, i2d_PKCS12_SAFEBAG,
+                          0, V_ASN1_SEQUENCE, v);
                break;
 
                case NID_certBag:
@@ -141,28 +136,26 @@ unsigned char **pp;
                break;
        }
 
-       M_ASN1_I2D_put_SET (a->attrib, i2d_X509_ATTRIBUTE);
+       M_ASN1_I2D_put_SET_type (X509_ATTRIBUTE, a->attrib, i2d_X509_ATTRIBUTE);
 
        M_ASN1_I2D_finish();
 }
 
-PKCS12_SAFEBAG *PKCS12_SAFEBAG_new()
+PKCS12_SAFEBAG *PKCS12_SAFEBAG_new(void)
 {
        PKCS12_SAFEBAG *ret=NULL;
        ASN1_CTX c;
        M_ASN1_New_Malloc(ret, PKCS12_SAFEBAG);
        ret->type=NULL;
        ret->value.other=NULL;
-       M_ASN1_New(ret->attrib, sk_new_null);
+       M_ASN1_New(ret->attrib, sk_X509_ATTRIBUTE_new_null);
        ret->rest=NULL;
        return (ret);
        M_ASN1_New_Error(ASN1_F_PKCS12_SAFEBAG_NEW);
 }
 
-PKCS12_SAFEBAG *d2i_PKCS12_SAFEBAG(a,pp,length)
-PKCS12_SAFEBAG **a;
-unsigned char **pp;
-long length;
+PKCS12_SAFEBAG *d2i_PKCS12_SAFEBAG(PKCS12_SAFEBAG **a, unsigned char **pp,
+            long length)
 {
        int bagnid;
        M_ASN1_D2I_vars(a,PKCS12_SAFEBAG *,PKCS12_SAFEBAG_new);
@@ -184,9 +177,10 @@ long length;
                break;
 
                case NID_safeContentsBag:
-                       M_ASN1_D2I_get_EXP_set_opt(ret->value.safes,
-                               d2i_PKCS12_SAFEBAG, PKCS12_SAFEBAG_free,
-                                                        0, V_ASN1_SEQUENCE);
+                       M_ASN1_D2I_get_EXP_set_opt_type
+                         (PKCS12_SAFEBAG, ret->value.safes,
+                          d2i_PKCS12_SAFEBAG, PKCS12_SAFEBAG_free, 0,
+                          V_ASN1_SEQUENCE);
                break;
 
                case NID_certBag:
@@ -201,13 +195,12 @@ long length;
                                                         d2i_ASN1_TYPE, 0);
                break;
        }
-       M_ASN1_D2I_get_set_opt(ret->attrib, d2i_X509_ATTRIBUTE,
-                                                        X509_ATTRIBUTE_free);
+       M_ASN1_D2I_get_set_opt_type(X509_ATTRIBUTE,ret->attrib,
+                                   d2i_X509_ATTRIBUTE,X509_ATTRIBUTE_free);
        M_ASN1_D2I_Finish(a, PKCS12_SAFEBAG_free, ASN1_F_D2I_PKCS12_SAFEBAG);
 }
 
-void PKCS12_SAFEBAG_free (a)
-PKCS12_SAFEBAG *a;
+void PKCS12_SAFEBAG_free (PKCS12_SAFEBAG *a)
 {
        if (a == NULL) return;
        switch (OBJ_obj2nid(a->type)) {
@@ -232,6 +225,10 @@ PKCS12_SAFEBAG *a;
        }
 
        ASN1_OBJECT_free (a->type);
-       sk_pop_free (a->attrib, X509_ATTRIBUTE_free);
-       Free ((char *)a);
+       sk_X509_ATTRIBUTE_pop_free (a->attrib, X509_ATTRIBUTE_free);
+       OPENSSL_free (a);
 }
+
+IMPLEMENT_STACK_OF(PKCS12_SAFEBAG)
+IMPLEMENT_ASN1_SET_OF(PKCS12_SAFEBAG)
+IMPLEMENT_PKCS12_STACK_OF(PKCS12_SAFEBAG)