1 files changed, 15 insertions, 8 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_sbag.c b/src/lib/libcrypto/pkcs12/p12_sbag.c
index 1b3addece1..64ac32ee6f 100644
--- a/src/lib/libcrypto/pkcs12/p12_sbag.c
+++ b/src/lib/libcrypto/pkcs12/p12_sbag.c
@@ -81,8 +81,9 @@ int i2d_PKCS12_SAFEBAG(PKCS12_SAFEBAG *a, 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:
@@ -117,8 +118,9 @@ int i2d_PKCS12_SAFEBAG(PKCS12_SAFEBAG *a, 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:
@@ -175,9 +177,10 @@ PKCS12_SAFEBAG *d2i_PKCS12_SAFEBAG(PKCS12_SAFEBAG **a, unsigned char **pp,
                 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:
@@ -223,5 +226,9 @@ void PKCS12_SAFEBAG_free (PKCS12_SAFEBAG *a)
 
         ASN1_OBJECT_free (a->type);
         sk_X509_ATTRIBUTE_pop_free (a->attrib, X509_ATTRIBUTE_free);
-        Free (a);
+        OPENSSL_free (a);
 }
+
+IMPLEMENT_STACK_OF(PKCS12_SAFEBAG)
+IMPLEMENT_ASN1_SET_OF(PKCS12_SAFEBAG)
+IMPLEMENT_PKCS12_STACK_OF(PKCS12_SAFEBAG)