mirror of
https://github.com/openssl/openssl.git
synced 2024-12-21 06:09:35 +08:00
fe2a7341b5
Fixes #19718 Fixes #19716 Added PKCS12_SAFEBAG_get1_cert_ex(), PKCS12_SAFEBAG_get1_crl_ex() and ASN1_item_unpack_ex(). parse_bag and parse_bags now use the libctx/propq stored in the P7_CTX. PKCS12_free() needed to be manually constructed in order to free the propq. pkcs12_api_test.c changed so that it actually tests the libctx, propq. Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/19942)
92 lines
3.4 KiB
C
92 lines
3.4 KiB
C
/*
|
|
* Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (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 "internal/cryptlib.h"
|
|
#include <openssl/asn1t.h>
|
|
#include <openssl/pkcs12.h>
|
|
#include "p12_local.h"
|
|
#include "crypto/pkcs7.h"
|
|
|
|
/* PKCS#12 ASN1 module */
|
|
|
|
ASN1_SEQUENCE(PKCS12) = {
|
|
ASN1_SIMPLE(PKCS12, version, ASN1_INTEGER),
|
|
ASN1_SIMPLE(PKCS12, authsafes, PKCS7),
|
|
ASN1_OPT(PKCS12, mac, PKCS12_MAC_DATA)
|
|
} ASN1_SEQUENCE_END(PKCS12)
|
|
|
|
IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(PKCS12, PKCS12, PKCS12)
|
|
|
|
PKCS12 *PKCS12_new(void)
|
|
{
|
|
return (PKCS12 *)ASN1_item_new(ASN1_ITEM_rptr(PKCS12));
|
|
}
|
|
|
|
void PKCS12_free(PKCS12 *p12)
|
|
{
|
|
if (p12 != NULL && p12->authsafes != NULL) {
|
|
OPENSSL_free(p12->authsafes->ctx.propq);
|
|
p12->authsafes->ctx.propq = NULL;
|
|
}
|
|
ASN1_item_free((ASN1_VALUE *)p12, ASN1_ITEM_rptr(PKCS12));
|
|
}
|
|
|
|
ASN1_SEQUENCE(PKCS12_MAC_DATA) = {
|
|
ASN1_SIMPLE(PKCS12_MAC_DATA, dinfo, X509_SIG),
|
|
ASN1_SIMPLE(PKCS12_MAC_DATA, salt, ASN1_OCTET_STRING),
|
|
ASN1_OPT(PKCS12_MAC_DATA, iter, ASN1_INTEGER)
|
|
} ASN1_SEQUENCE_END(PKCS12_MAC_DATA)
|
|
|
|
IMPLEMENT_ASN1_FUNCTIONS(PKCS12_MAC_DATA)
|
|
|
|
ASN1_ADB_TEMPLATE(bag_default) = ASN1_EXP(PKCS12_BAGS, value.other, ASN1_ANY, 0);
|
|
|
|
ASN1_ADB(PKCS12_BAGS) = {
|
|
ADB_ENTRY(NID_x509Certificate, ASN1_EXP(PKCS12_BAGS, value.x509cert, ASN1_OCTET_STRING, 0)),
|
|
ADB_ENTRY(NID_x509Crl, ASN1_EXP(PKCS12_BAGS, value.x509crl, ASN1_OCTET_STRING, 0)),
|
|
ADB_ENTRY(NID_sdsiCertificate, ASN1_EXP(PKCS12_BAGS, value.sdsicert, ASN1_IA5STRING, 0)),
|
|
} ASN1_ADB_END(PKCS12_BAGS, 0, type, 0, &bag_default_tt, NULL);
|
|
|
|
ASN1_SEQUENCE(PKCS12_BAGS) = {
|
|
ASN1_SIMPLE(PKCS12_BAGS, type, ASN1_OBJECT),
|
|
ASN1_ADB_OBJECT(PKCS12_BAGS),
|
|
} ASN1_SEQUENCE_END(PKCS12_BAGS)
|
|
|
|
IMPLEMENT_ASN1_FUNCTIONS(PKCS12_BAGS)
|
|
|
|
ASN1_ADB_TEMPLATE(safebag_default) = ASN1_EXP(PKCS12_SAFEBAG, value.other, ASN1_ANY, 0);
|
|
|
|
ASN1_ADB(PKCS12_SAFEBAG) = {
|
|
ADB_ENTRY(NID_keyBag, ASN1_EXP(PKCS12_SAFEBAG, value.keybag, PKCS8_PRIV_KEY_INFO, 0)),
|
|
ADB_ENTRY(NID_pkcs8ShroudedKeyBag, ASN1_EXP(PKCS12_SAFEBAG, value.shkeybag, X509_SIG, 0)),
|
|
ADB_ENTRY(NID_safeContentsBag, ASN1_EXP_SEQUENCE_OF(PKCS12_SAFEBAG, value.safes, PKCS12_SAFEBAG, 0)),
|
|
ADB_ENTRY(NID_certBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)),
|
|
ADB_ENTRY(NID_crlBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)),
|
|
ADB_ENTRY(NID_secretBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0))
|
|
} ASN1_ADB_END(PKCS12_SAFEBAG, 0, type, 0, &safebag_default_tt, NULL);
|
|
|
|
ASN1_SEQUENCE(PKCS12_SAFEBAG) = {
|
|
ASN1_SIMPLE(PKCS12_SAFEBAG, type, ASN1_OBJECT),
|
|
ASN1_ADB_OBJECT(PKCS12_SAFEBAG),
|
|
ASN1_SET_OF_OPT(PKCS12_SAFEBAG, attrib, X509_ATTRIBUTE)
|
|
} ASN1_SEQUENCE_END(PKCS12_SAFEBAG)
|
|
|
|
IMPLEMENT_ASN1_FUNCTIONS(PKCS12_SAFEBAG)
|
|
|
|
/* SEQUENCE OF SafeBag */
|
|
ASN1_ITEM_TEMPLATE(PKCS12_SAFEBAGS) =
|
|
ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, PKCS12_SAFEBAGS, PKCS12_SAFEBAG)
|
|
ASN1_ITEM_TEMPLATE_END(PKCS12_SAFEBAGS)
|
|
|
|
/* Authsafes: SEQUENCE OF PKCS7 */
|
|
ASN1_ITEM_TEMPLATE(PKCS12_AUTHSAFES) =
|
|
ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, PKCS12_AUTHSAFES, PKCS7)
|
|
ASN1_ITEM_TEMPLATE_END(PKCS12_AUTHSAFES)
|