/* p12_sbag.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
+/*
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 1999-2015.
*/
/* ====================================================================
* Copyright (c) 1999 The OpenSSL Project. All rights reserved.
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * 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
*/
#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)
- */
+ASN1_TYPE *PKCS12_SAFEBAG_get0_attr(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(p8->attributes, attr_nid);
+}
+
+PKCS8_PRIV_KEY_INFO *PKCS12_SAFEBAG_get0_p8inf(PKCS12_SAFEBAG *bag)
+{
+ if (PKCS12_SAFEBAG_get_nid(bag) != NID_keyBag)
+ return NULL;
+ return bag->value.keybag;
+}
-int i2d_PKCS12_SAFEBAG(a,pp)
-PKCS12_SAFEBAG *a;
-unsigned char **pp;
+X509_SIG *PKCS12_SAFEBAG_get0_pkcs8(PKCS12_SAFEBAG *bag)
{
- 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();
+ if (OBJ_obj2nid(bag->type) != NID_pkcs8ShroudedKeyBag)
+ return NULL;
+ return bag->value.shkeybag;
}
-PKCS12_SAFEBAG *PKCS12_SAFEBAG_new()
+STACK_OF(PKCS12_SAFEBAG) *PKCS12_SAFEBAG_get0_safes(PKCS12_SAFEBAG *bag)
{
- 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);
+ if (OBJ_obj2nid(bag->type) != NID_safeContentsBag)
+ return NULL;
+ return bag->value.safes;
}
-PKCS12_SAFEBAG *d2i_PKCS12_SAFEBAG(a,pp,length)
-PKCS12_SAFEBAG **a;
-unsigned char **pp;
-long length;
+ASN1_OBJECT *PKCS12_SAFEBAG_get0_type(PKCS12_SAFEBAG *bag)
{
- 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);
+ return bag->type;
}
-void PKCS12_SAFEBAG_free (a)
-PKCS12_SAFEBAG *a;
+int PKCS12_SAFEBAG_get_nid(PKCS12_SAFEBAG *bag)
{
- 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 OBJ_obj2nid(bag->type);
+}
+
+int PKCS12_SAFEBAG_get_bag_nid(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(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(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) {
+ PKCS12err(PKCS12_F_PKCS12_SAFEBAG_CREATE_PKCS8_ENCRYPT, ERR_R_MALLOC_FAILURE);
+ return NULL;
+ }
+
+ bag = PKCS12_SAFEBAG_create0_pkcs8(p8);
+
+ if (bag == NULL) {
+ PKCS12err(PKCS12_F_PKCS12_SAFEBAG_CREATE_PKCS8_ENCRYPT, ERR_R_MALLOC_FAILURE);
+ X509_SIG_free(p8);
+ return NULL;
+ }
+
+ return bag;
}
projects / openssl.git / blobdiff