remove needless and misleading malloc failure error messages of PKCS12_SAFEBAG_create...
[openssl.git] / crypto / pkcs12 / p12_sbag.c
index d39ffe4ff9a1f5b9e66e0541fdfdab8ca71a38b8..2f1ce58739ec1a14009f2e93c9ca453ceb5c74fd 100644 (file)
-/* 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).
+/*
+ * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
  *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
  */
 
 #include <stdio.h>
-#include "cryptlib.h"
-#include "asn1_mac.h"
-#include "pkcs12.h"
+#include "internal/cryptlib.h"
+#include <openssl/pkcs12.h>
+#include "p12_lcl.h"
 
-/*
- *ASN1err(ASN1_F_PKCS12_SAFEBAG_NEW,ASN1_R_DECODE_ERROR)
- *ASN1err(ASN1_F_D2I_PKCS12_SAFEBAG,ASN1_R_DECODE_ERROR)
- */
+#if OPENSSL_API_COMPAT < 0x10100000L
+ASN1_TYPE *PKCS12_get_attr(const PKCS12_SAFEBAG *bag, int attr_nid)
+{
+    return PKCS12_get_attr_gen(bag->attrib, attr_nid);
+}
+#endif
+
+const ASN1_TYPE *PKCS12_SAFEBAG_get0_attr(const PKCS12_SAFEBAG *bag,
+                                          int attr_nid)
+{
+    return PKCS12_get_attr_gen(bag->attrib, attr_nid);
+}
+
+ASN1_TYPE *PKCS8_get_attr(PKCS8_PRIV_KEY_INFO *p8, int attr_nid)
+{
+    return PKCS12_get_attr_gen(PKCS8_pkey_get0_attrs(p8), attr_nid);
+}
+
+const PKCS8_PRIV_KEY_INFO *PKCS12_SAFEBAG_get0_p8inf(const PKCS12_SAFEBAG *bag)
+{
+    if (PKCS12_SAFEBAG_get_nid(bag) != NID_keyBag)
+        return NULL;
+    return bag->value.keybag;
+}
+
+const X509_SIG *PKCS12_SAFEBAG_get0_pkcs8(const PKCS12_SAFEBAG *bag)
+{
+    if (OBJ_obj2nid(bag->type) != NID_pkcs8ShroudedKeyBag)
+        return NULL;
+    return bag->value.shkeybag;
+}
+
+const STACK_OF(PKCS12_SAFEBAG) *
+PKCS12_SAFEBAG_get0_safes(const PKCS12_SAFEBAG *bag)
+{
+    if (OBJ_obj2nid(bag->type) != NID_safeContentsBag)
+        return NULL;
+    return bag->value.safes;
+}
+
+const ASN1_OBJECT *PKCS12_SAFEBAG_get0_type(const PKCS12_SAFEBAG *bag)
+{
+    return bag->type;
+}
+
+int PKCS12_SAFEBAG_get_nid(const PKCS12_SAFEBAG *bag)
+{
+    return OBJ_obj2nid(bag->type);
+}
+
+int PKCS12_SAFEBAG_get_bag_nid(const PKCS12_SAFEBAG *bag)
+{
+    int btype = PKCS12_SAFEBAG_get_nid(bag);
+
+    if (btype != NID_certBag && btype != NID_crlBag && btype != NID_secretBag)
+        return -1;
+    return OBJ_obj2nid(bag->value.bag->type);
+}
+
+X509 *PKCS12_SAFEBAG_get1_cert(const PKCS12_SAFEBAG *bag)
+{
+    if (PKCS12_SAFEBAG_get_nid(bag) != NID_certBag)
+        return NULL;
+    if (OBJ_obj2nid(bag->value.bag->type) != NID_x509Certificate)
+        return NULL;
+    return ASN1_item_unpack(bag->value.bag->value.octet,
+                            ASN1_ITEM_rptr(X509));
+}
+
+X509_CRL *PKCS12_SAFEBAG_get1_crl(const PKCS12_SAFEBAG *bag)
+{
+    if (PKCS12_SAFEBAG_get_nid(bag) != NID_crlBag)
+        return NULL;
+    if (OBJ_obj2nid(bag->value.bag->type) != NID_x509Crl)
+        return NULL;
+    return ASN1_item_unpack(bag->value.bag->value.octet,
+                            ASN1_ITEM_rptr(X509_CRL));
+}
+
+PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_cert(X509 *x509)
+{
+    return PKCS12_item_pack_safebag(x509, ASN1_ITEM_rptr(X509),
+                                    NID_x509Certificate, NID_certBag);
+}
+
+PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_crl(X509_CRL *crl)
+{
+    return PKCS12_item_pack_safebag(crl, ASN1_ITEM_rptr(X509_CRL),
+                                    NID_x509Crl, NID_crlBag);
+}
+
+/* Turn PKCS8 object into a keybag */
+
+PKCS12_SAFEBAG *PKCS12_SAFEBAG_create0_p8inf(PKCS8_PRIV_KEY_INFO *p8)
+{
+    PKCS12_SAFEBAG *bag = PKCS12_SAFEBAG_new();
+
+    if (bag == NULL) {
+        PKCS12err(PKCS12_F_PKCS12_SAFEBAG_CREATE0_P8INF, ERR_R_MALLOC_FAILURE);
+        return NULL;
+    }
+    bag->type = OBJ_nid2obj(NID_keyBag);
+    bag->value.keybag = p8;
+    return bag;
+}
+
+/* Turn PKCS8 object into a shrouded keybag */
+
+PKCS12_SAFEBAG *PKCS12_SAFEBAG_create0_pkcs8(X509_SIG *p8)
+{
+    PKCS12_SAFEBAG *bag = PKCS12_SAFEBAG_new();
+
+    /* Set up the safe bag */
+    if (bag == NULL) {
+        PKCS12err(PKCS12_F_PKCS12_SAFEBAG_CREATE0_PKCS8, ERR_R_MALLOC_FAILURE);
+        return NULL;
+    }
+    bag->type = OBJ_nid2obj(NID_pkcs8ShroudedKeyBag);
+    bag->value.shkeybag = p8;
+    return bag;
+}
+
+PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_pkcs8_encrypt(int pbe_nid,
+                                                    const char *pass,
+                                                    int passlen,
+                                                    unsigned char *salt,
+                                                    int saltlen, int iter,
+                                                    PKCS8_PRIV_KEY_INFO *p8inf)
+{
+    PKCS12_SAFEBAG *bag;
+    const EVP_CIPHER *pbe_ciph;
+    X509_SIG *p8;
+
+    pbe_ciph = EVP_get_cipherbynid(pbe_nid);
+    if (pbe_ciph)
+        pbe_nid = -1;
+
+    p8 = PKCS8_encrypt(pbe_nid, pbe_ciph, pass, passlen, salt, saltlen, iter,
+                       p8inf);
+    if (p8 == NULL)
+        return NULL;
+
+    bag = PKCS12_SAFEBAG_create0_pkcs8(p8);
+    if (bag == NULL)
+        X509_SIG_free(p8);
 
-int i2d_PKCS12_SAFEBAG(a,pp)
-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 (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 (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 (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 (a->attrib, i2d_X509_ATTRIBUTE);
-
-       M_ASN1_I2D_finish();
-}
-
-PKCS12_SAFEBAG *PKCS12_SAFEBAG_new()
-{
-       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);
-       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;
-{
-       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(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(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;
-{
-       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_pop_free (a->attrib, X509_ATTRIBUTE_free);
-       Free ((char *)a);
+    return bag;
 }