Delete PKCS#12 redundant files.
authorDr. Stephen Henson <steve@openssl.org>
Sat, 30 Dec 2000 12:26:33 +0000 (12:26 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sat, 30 Dec 2000 12:26:33 +0000 (12:26 +0000)
crypto/pkcs12/p12_bags.c [deleted file]
crypto/pkcs12/p12_lib.c [deleted file]
crypto/pkcs12/p12_mac.c [deleted file]
crypto/pkcs12/p12_sbag.c [deleted file]

diff --git a/crypto/pkcs12/p12_bags.c b/crypto/pkcs12/p12_bags.c
deleted file mode 100644 (file)
index 56547ef..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-/* p12_bags.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1_mac.h>
-#include <openssl/pkcs12.h>
-
-int i2d_PKCS12_BAGS(PKCS12_BAGS *a, unsigned char **pp)
-{
-       int bagnid, v = 0;
-       M_ASN1_I2D_vars(a);
-       bagnid = OBJ_obj2nid (a->type);
-       M_ASN1_I2D_len (a->type, i2d_ASN1_OBJECT);
-       
-       switch (bagnid) {
-
-               case NID_x509Certificate:
-                       M_ASN1_I2D_len_EXP_opt (a->value.x509cert,
-                                                i2d_ASN1_OCTET_STRING, 0, v);
-               break;
-
-               case NID_x509Crl:
-                       M_ASN1_I2D_len_EXP_opt (a->value.x509crl,
-                                                i2d_ASN1_OCTET_STRING, 0, v);
-               break;
-
-               case NID_sdsiCertificate:
-                       M_ASN1_I2D_len_EXP_opt (a->value.sdsicert,
-                                                i2d_ASN1_IA5STRING, 0, v);
-               break;
-
-               default:
-                       M_ASN1_I2D_len_EXP_opt (a->value.other,
-                                                i2d_ASN1_TYPE, 0, v);
-               break;
-       }
-
-       M_ASN1_I2D_seq_total ();
-       
-       M_ASN1_I2D_put (a->type, i2d_ASN1_OBJECT);
-       
-       switch (bagnid) {
-
-               case NID_x509Certificate:
-                       M_ASN1_I2D_put_EXP_opt (a->value.x509cert,
-                                                i2d_ASN1_OCTET_STRING, 0, v);
-               break;
-
-               case NID_x509Crl:
-                       M_ASN1_I2D_put_EXP_opt (a->value.x509crl,
-                                                i2d_ASN1_OCTET_STRING, 0, v);
-               break;
-
-               case NID_sdsiCertificate:
-                       M_ASN1_I2D_put_EXP_opt (a->value.sdsicert,
-                                                i2d_ASN1_IA5STRING, 0, v);
-               break;
-
-               default:
-               M_ASN1_I2D_put_EXP_opt (a->value.other, i2d_ASN1_TYPE, 0, v);
-               break;
-       }
-       M_ASN1_I2D_finish();
-}
-
-PKCS12_BAGS *PKCS12_BAGS_new(void)
-{
-       PKCS12_BAGS *ret=NULL;
-       ASN1_CTX c;
-       M_ASN1_New_Malloc(ret, PKCS12_BAGS);
-       ret->type=NULL;
-       ret->value.other=NULL;
-       return (ret);
-       M_ASN1_New_Error(ASN1_F_PKCS12_BAGS_NEW);
-}
-
-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);
-       M_ASN1_D2I_Init();
-       M_ASN1_D2I_start_sequence();
-       M_ASN1_D2I_get (ret->type, d2i_ASN1_OBJECT);
-       bagnid = OBJ_obj2nid (ret->type);
-       switch (bagnid) {
-
-               case NID_x509Certificate:
-                       M_ASN1_D2I_get_EXP_opt (ret->value.x509cert,
-                                                d2i_ASN1_OCTET_STRING, 0);
-               break;
-
-               case NID_x509Crl:
-                       M_ASN1_D2I_get_EXP_opt (ret->value.x509crl,
-                                                d2i_ASN1_OCTET_STRING, 0);
-               break;
-
-               case NID_sdsiCertificate:
-                       M_ASN1_D2I_get_EXP_opt (ret->value.sdsicert,
-                                                d2i_ASN1_IA5STRING, 0);
-               break;
-
-               default:
-                       M_ASN1_D2I_get_EXP_opt (ret->value.other,
-                                                        d2i_ASN1_TYPE, 0);
-               break;
-       }
-
-       M_ASN1_D2I_Finish(a, PKCS12_BAGS_free, ASN1_F_D2I_PKCS12_BAGS);
-}
-
-void PKCS12_BAGS_free (PKCS12_BAGS *a)
-{
-       if (a == NULL) return;
-       switch (OBJ_obj2nid(a->type)) {
-
-               case NID_x509Certificate:
-                       M_ASN1_OCTET_STRING_free (a->value.x509cert);
-               break;
-
-               case NID_x509Crl:
-                       M_ASN1_OCTET_STRING_free (a->value.x509crl);
-               break;
-
-               case NID_sdsiCertificate:
-                       M_ASN1_IA5STRING_free (a->value.sdsicert);
-               break;
-
-               default:
-                       ASN1_TYPE_free (a->value.other);
-               break;
-       }
-
-       ASN1_OBJECT_free (a->type);
-       OPENSSL_free (a);
-}
diff --git a/crypto/pkcs12/p12_lib.c b/crypto/pkcs12/p12_lib.c
deleted file mode 100644 (file)
index 7d464e3..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/* p12_lib.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1_mac.h>
-#include <openssl/pkcs12.h>
-
-int i2d_PKCS12(PKCS12 *a, unsigned char **pp)
-{
-       M_ASN1_I2D_vars(a);
-
-       M_ASN1_I2D_len (a->version, i2d_ASN1_INTEGER);
-       M_ASN1_I2D_len (a->authsafes, i2d_PKCS7);
-       M_ASN1_I2D_len (a->mac, i2d_PKCS12_MAC_DATA);
-
-       M_ASN1_I2D_seq_total();
-
-       M_ASN1_I2D_put (a->version, i2d_ASN1_INTEGER);
-       M_ASN1_I2D_put (a->authsafes, i2d_PKCS7);
-       M_ASN1_I2D_put (a->mac, i2d_PKCS12_MAC_DATA);
-
-       M_ASN1_I2D_finish();
-}
-
-PKCS12 *d2i_PKCS12(PKCS12 **a, unsigned char **pp, long length)
-{
-       M_ASN1_D2I_vars(a,PKCS12 *,PKCS12_new);
-       M_ASN1_D2I_Init();
-       M_ASN1_D2I_start_sequence();
-       M_ASN1_D2I_get (ret->version, d2i_ASN1_INTEGER);
-       M_ASN1_D2I_get (ret->authsafes, d2i_PKCS7);
-       M_ASN1_D2I_get_opt (ret->mac, d2i_PKCS12_MAC_DATA, V_ASN1_SEQUENCE);
-       M_ASN1_D2I_Finish(a, PKCS12_free, ASN1_F_D2I_PKCS12);
-}
-
-PKCS12 *PKCS12_new(void)
-{
-       PKCS12 *ret=NULL;
-       ASN1_CTX c;
-       M_ASN1_New_Malloc(ret, PKCS12);
-       ret->version=NULL;
-       ret->mac=NULL;
-       ret->authsafes=NULL;
-       return (ret);
-       M_ASN1_New_Error(ASN1_F_PKCS12_NEW);
-}
-
-void PKCS12_free (PKCS12 *a)
-{
-       if (a == NULL) return;
-       M_ASN1_INTEGER_free(a->version);
-       PKCS12_MAC_DATA_free (a->mac);
-       PKCS7_free (a->authsafes);
-       OPENSSL_free (a);
-}
diff --git a/crypto/pkcs12/p12_mac.c b/crypto/pkcs12/p12_mac.c
deleted file mode 100644 (file)
index fbd1eca..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-/* p12_mac.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1_mac.h>
-#include <openssl/pkcs12.h>
-
-int i2d_PKCS12_MAC_DATA(PKCS12_MAC_DATA *a, unsigned char **pp)
-{
-       M_ASN1_I2D_vars(a);
-       M_ASN1_I2D_len (a->dinfo, i2d_X509_SIG);
-       M_ASN1_I2D_len (a->salt, i2d_ASN1_OCTET_STRING);
-       M_ASN1_I2D_len (a->iter, i2d_ASN1_INTEGER);
-
-       M_ASN1_I2D_seq_total();
-
-       M_ASN1_I2D_put (a->dinfo, i2d_X509_SIG);
-       M_ASN1_I2D_put (a->salt, i2d_ASN1_OCTET_STRING);
-       M_ASN1_I2D_put (a->iter, i2d_ASN1_INTEGER);
-       M_ASN1_I2D_finish();
-}
-
-PKCS12_MAC_DATA *PKCS12_MAC_DATA_new(void)
-{
-       PKCS12_MAC_DATA *ret=NULL;
-       ASN1_CTX c;
-       M_ASN1_New_Malloc(ret, PKCS12_MAC_DATA);
-       ret->dinfo = X509_SIG_new();
-       ret->salt = M_ASN1_OCTET_STRING_new();
-       ret->iter = NULL;
-       return(ret);
-       M_ASN1_New_Error(ASN1_F_PKCS12_MAC_DATA_NEW);
-}
-
-PKCS12_MAC_DATA *d2i_PKCS12_MAC_DATA(PKCS12_MAC_DATA **a, unsigned char **pp,
-            long length)
-{
-       M_ASN1_D2I_vars(a,PKCS12_MAC_DATA *,PKCS12_MAC_DATA_new);
-       M_ASN1_D2I_Init();
-       M_ASN1_D2I_start_sequence();
-       M_ASN1_D2I_get(ret->dinfo, d2i_X509_SIG);
-       M_ASN1_D2I_get(ret->salt, d2i_ASN1_OCTET_STRING);
-       M_ASN1_D2I_get_opt(ret->iter, d2i_ASN1_INTEGER, V_ASN1_INTEGER);
-       M_ASN1_D2I_Finish(a, PKCS12_MAC_DATA_free, ASN1_F_D2I_PKCS12_MAC_DATA);
-}
-
-void PKCS12_MAC_DATA_free (PKCS12_MAC_DATA *a)
-{
-       if (a == NULL) return;
-       X509_SIG_free (a->dinfo);
-       M_ASN1_OCTET_STRING_free(a->salt);
-       M_ASN1_INTEGER_free(a->iter);
-       OPENSSL_free (a);
-}
diff --git a/crypto/pkcs12/p12_sbag.c b/crypto/pkcs12/p12_sbag.c
deleted file mode 100644 (file)
index 64ac32e..0000000
+++ /dev/null
@@ -1,234 +0,0 @@
-/* p12_sbag.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include "cryptlib.h"
-#include <openssl/asn1_mac.h>
-#include <openssl/pkcs12.h>
-
-int i2d_PKCS12_SAFEBAG(PKCS12_SAFEBAG *a, unsigned char **pp)
-{
-       int bagnid, v = 0;
-       M_ASN1_I2D_vars(a);
-       bagnid = OBJ_obj2nid (a->type);
-       M_ASN1_I2D_len (a->type, i2d_ASN1_OBJECT);
-       
-       switch (bagnid) {
-
-               case NID_keyBag:
-                       M_ASN1_I2D_len_EXP_opt (a->value.keybag,
-                                                i2d_PKCS8_PRIV_KEY_INFO, 0, v);
-               break;
-
-               case NID_pkcs8ShroudedKeyBag:
-                       M_ASN1_I2D_len_EXP_opt (a->value.shkeybag,
-                                                i2d_X509_SIG, 0, v);
-               break;
-
-               case NID_safeContentsBag:
-                       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:
-               case NID_crlBag:
-               case NID_secretBag:
-                       M_ASN1_I2D_len_EXP_opt (a->value.bag,
-                                                i2d_PKCS12_BAGS, 0, v);
-               break;
-
-               default:
-                       M_ASN1_I2D_len_EXP_opt (a->value.other,
-                                                i2d_ASN1_TYPE, 0, v);
-               break;
-       }
-
-       M_ASN1_I2D_len_SET_type (X509_ATTRIBUTE,a->attrib, i2d_X509_ATTRIBUTE);
-
-       M_ASN1_I2D_seq_total ();
-       
-       M_ASN1_I2D_put (a->type, i2d_ASN1_OBJECT);
-
-       switch (bagnid) {
-
-               case NID_keyBag:
-                       M_ASN1_I2D_put_EXP_opt (a->value.keybag,
-                                                i2d_PKCS8_PRIV_KEY_INFO, 0, v);
-               break;
-
-               case NID_pkcs8ShroudedKeyBag:
-                       M_ASN1_I2D_put_EXP_opt (a->value.shkeybag,
-                                                i2d_X509_SIG, 0, v);
-               break;
-
-               case NID_safeContentsBag:
-                       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:
-               case NID_crlBag:
-               case NID_secretBag:
-                       M_ASN1_I2D_put_EXP_opt (a->value.bag,
-                                                i2d_PKCS12_BAGS, 0, v);
-               break;
-
-               default:
-                       M_ASN1_I2D_put_EXP_opt (a->value.other,
-                                                i2d_ASN1_TYPE, 0, v);
-               break;
-       }
-
-       M_ASN1_I2D_put_SET_type (X509_ATTRIBUTE, a->attrib, i2d_X509_ATTRIBUTE);
-
-       M_ASN1_I2D_finish();
-}
-
-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_X509_ATTRIBUTE_new_null);
-       ret->rest=NULL;
-       return (ret);
-       M_ASN1_New_Error(ASN1_F_PKCS12_SAFEBAG_NEW);
-}
-
-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);
-       M_ASN1_D2I_Init();
-       M_ASN1_D2I_start_sequence();
-       M_ASN1_D2I_get (ret->type, d2i_ASN1_OBJECT);
-       bagnid = OBJ_obj2nid (ret->type);
-
-       switch (bagnid) {
-
-               case NID_keyBag:
-                       M_ASN1_D2I_get_EXP_opt (ret->value.keybag,
-                                                d2i_PKCS8_PRIV_KEY_INFO, 0);
-               break;
-
-               case NID_pkcs8ShroudedKeyBag:
-                       M_ASN1_D2I_get_EXP_opt (ret->value.shkeybag,
-                                                       d2i_X509_SIG, 0);
-               break;
-
-               case NID_safeContentsBag:
-                       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:
-               case NID_crlBag:
-               case NID_secretBag:
-                       M_ASN1_D2I_get_EXP_opt (ret->value.bag,
-                                                        d2i_PKCS12_BAGS, 0);
-               break;
-
-               default:
-                       M_ASN1_D2I_get_EXP_opt (ret->value.other,
-                                                        d2i_ASN1_TYPE, 0);
-               break;
-       }
-       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 (PKCS12_SAFEBAG *a)
-{
-       if (a == NULL) return;
-       switch (OBJ_obj2nid(a->type)) {
-
-               case NID_keyBag:
-                       PKCS8_PRIV_KEY_INFO_free (a->value.keybag);
-               break;
-
-               case NID_pkcs8ShroudedKeyBag:
-                       X509_SIG_free (a->value.shkeybag);
-               break;
-
-               case NID_certBag:
-               case NID_crlBag:
-               case NID_secretBag:
-                       PKCS12_BAGS_free (a->value.bag);
-               break;
-
-               default:
-                       ASN1_TYPE_free (a->value.other);
-               break;
-       }
-
-       ASN1_OBJECT_free (a->type);
-       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)