From eb8dd9dca1228af0cd132f515509051ecfabf6f6 Mon Sep 17 00:00:00 2001 From: cvs2svn Date: Mon, 14 Apr 2025 17:32:06 +0000 Subject: This commit was manufactured by cvs2git to create tag 'tb_20250414'. --- src/lib/libcrypto/pkcs12/p12_add.c | 229 ------------------------------------- 1 file changed, 229 deletions(-) delete mode 100644 src/lib/libcrypto/pkcs12/p12_add.c (limited to 'src/lib/libcrypto/pkcs12/p12_add.c') diff --git a/src/lib/libcrypto/pkcs12/p12_add.c b/src/lib/libcrypto/pkcs12/p12_add.c deleted file mode 100644 index f6f42c558c..0000000000 --- a/src/lib/libcrypto/pkcs12/p12_add.c +++ /dev/null @@ -1,229 +0,0 @@ -/* $OpenBSD: p12_add.c,v 1.25 2024/03/02 10:20:27 tb Exp $ */ -/* Written by Dr Stephen N Henson (steve@openssl.org) 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 - -#include -#include - -#include "pkcs12_local.h" -#include "x509_local.h" - -/* Pack an object into an OCTET STRING and turn into a safebag */ - -PKCS12_SAFEBAG * -PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it, int nid1, int nid2) -{ - PKCS12_BAGS *bag; - PKCS12_SAFEBAG *safebag; - - if (!(bag = PKCS12_BAGS_new())) { - PKCS12error(ERR_R_MALLOC_FAILURE); - return NULL; - } - bag->type = OBJ_nid2obj(nid1); - if (!ASN1_item_pack(obj, it, &bag->value.octet)) { - PKCS12error(ERR_R_MALLOC_FAILURE); - PKCS12_BAGS_free(bag); - return NULL; - } - if (!(safebag = PKCS12_SAFEBAG_new())) { - PKCS12error(ERR_R_MALLOC_FAILURE); - PKCS12_BAGS_free(bag); - return NULL; - } - safebag->value.bag = bag; - safebag->type = OBJ_nid2obj(nid2); - return safebag; -} - -/* Turn a stack of SAFEBAGS into a PKCS#7 data Contentinfo */ -PKCS7 * -PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk) -{ - PKCS7 *p7; - - if (!(p7 = PKCS7_new())) { - PKCS12error(ERR_R_MALLOC_FAILURE); - return NULL; - } - p7->type = OBJ_nid2obj(NID_pkcs7_data); - if (!(p7->d.data = ASN1_OCTET_STRING_new())) { - PKCS12error(ERR_R_MALLOC_FAILURE); - goto err; - } - - if (!ASN1_item_pack(sk, &PKCS12_SAFEBAGS_it, &p7->d.data)) { - PKCS12error(PKCS12_R_CANT_PACK_STRUCTURE); - goto err; - } - return p7; - -err: - PKCS7_free(p7); - return NULL; -} - -/* Unpack SAFEBAGS from PKCS#7 data ContentInfo */ -STACK_OF(PKCS12_SAFEBAG) * -PKCS12_unpack_p7data(PKCS7 *p7) -{ - ASN1_OCTET_STRING *aos; - - if (!PKCS7_type_is_data(p7)) { - PKCS12error(PKCS12_R_CONTENT_TYPE_NOT_DATA); - return NULL; - } - if ((aos = PKCS7_get_octet_string(p7)) == NULL) - return NULL; - return ASN1_item_unpack(aos, &PKCS12_SAFEBAGS_it); -} -LCRYPTO_ALIAS(PKCS12_unpack_p7data); - -/* Turn a stack of SAFEBAGS into a PKCS#7 encrypted data ContentInfo */ - -PKCS7 * -PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen, - unsigned char *salt, int saltlen, int iter, STACK_OF(PKCS12_SAFEBAG) *bags) -{ - PKCS7 *p7; - X509_ALGOR *pbe; - const EVP_CIPHER *pbe_ciph; - - if (!(p7 = PKCS7_new())) { - PKCS12error(ERR_R_MALLOC_FAILURE); - return NULL; - } - if (!PKCS7_set_type(p7, NID_pkcs7_encrypted)) { - PKCS12error(PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE); - goto err; - } - - pbe_ciph = EVP_get_cipherbynid(pbe_nid); - - if (pbe_ciph) - pbe = PKCS5_pbe2_set(pbe_ciph, iter, salt, saltlen); - else - pbe = PKCS5_pbe_set(pbe_nid, iter, salt, saltlen); - - if (!pbe) { - PKCS12error(ERR_R_MALLOC_FAILURE); - goto err; - } - X509_ALGOR_free(p7->d.encrypted->enc_data->algorithm); - p7->d.encrypted->enc_data->algorithm = pbe; - ASN1_OCTET_STRING_free(p7->d.encrypted->enc_data->enc_data); - if (!(p7->d.encrypted->enc_data->enc_data = PKCS12_item_i2d_encrypt( - pbe, &PKCS12_SAFEBAGS_it, pass, passlen, bags, 1))) { - PKCS12error(PKCS12_R_ENCRYPT_ERROR); - goto err; - } - - return p7; - -err: - PKCS7_free(p7); - return NULL; -} - -STACK_OF(PKCS12_SAFEBAG) * -PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass, int passlen) -{ - PKCS7_ENC_CONTENT *content; - - if (!PKCS7_type_is_encrypted(p7)) - return NULL; - if (p7->d.encrypted == NULL) - return NULL; - if ((content = p7->d.encrypted->enc_data) == NULL) - return NULL; - return PKCS12_item_decrypt_d2i(content->algorithm, &PKCS12_SAFEBAGS_it, - pass, passlen, content->enc_data, 1); -} -LCRYPTO_ALIAS(PKCS12_unpack_p7encdata); - -PKCS8_PRIV_KEY_INFO * -PKCS12_decrypt_skey(const PKCS12_SAFEBAG *bag, const char *pass, int passlen) -{ - return PKCS8_decrypt(bag->value.shkeybag, pass, passlen); -} -LCRYPTO_ALIAS(PKCS12_decrypt_skey); - -int -PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes) -{ - if (ASN1_item_pack(safes, &PKCS12_AUTHSAFES_it, - &p12->authsafes->d.data)) - return 1; - return 0; -} - -STACK_OF(PKCS7) * -PKCS12_unpack_authsafes(const PKCS12 *p12) -{ - ASN1_OCTET_STRING *aos; - - if (!PKCS7_type_is_data(p12->authsafes)) { - PKCS12error(PKCS12_R_CONTENT_TYPE_NOT_DATA); - return NULL; - } - if ((aos = PKCS7_get_octet_string(p12->authsafes)) == NULL) - return NULL; - return ASN1_item_unpack(aos, &PKCS12_AUTHSAFES_it); -} -LCRYPTO_ALIAS(PKCS12_unpack_authsafes); -- cgit v1.2.3-55-g6feb