mirror of
https://github.com/openssl/openssl.git
synced 2024-12-09 05:51:54 +08:00
90a1f2d76f
-Public PKCS7 methods that create a PKCS7 object now have variants that also add a libctx and propq. This includes PKCS7_new_with_libctx(), PKCS7_sign_with_libctx() and PKCS7_encrypt_with_libctx() -Added SMIME_read_PKCS7_ex() so that a created PKCS7 object can be passed to the read. -d2i_PKCS7_bio() has been modified so that after it loads the PKCS7 object it then resolves any subobjects that require the libctx/propq (such as objects containing X509 certificates). Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/11884)
65 lines
2.0 KiB
C
65 lines
2.0 KiB
C
/*
|
|
* Copyright 1999-2017 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/x509.h>
|
|
#include <openssl/asn1.h>
|
|
#include "pk7_local.h"
|
|
|
|
/* PKCS#7 wrappers round generalised stream and MIME routines */
|
|
|
|
int i2d_PKCS7_bio_stream(BIO *out, PKCS7 *p7, BIO *in, int flags)
|
|
{
|
|
return i2d_ASN1_bio_stream(out, (ASN1_VALUE *)p7, in, flags,
|
|
ASN1_ITEM_rptr(PKCS7));
|
|
}
|
|
|
|
int PEM_write_bio_PKCS7_stream(BIO *out, PKCS7 *p7, BIO *in, int flags)
|
|
{
|
|
return PEM_write_bio_ASN1_stream(out, (ASN1_VALUE *)p7, in, flags,
|
|
"PKCS7", ASN1_ITEM_rptr(PKCS7));
|
|
}
|
|
|
|
int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags)
|
|
{
|
|
STACK_OF(X509_ALGOR) *mdalgs;
|
|
int ctype_nid = OBJ_obj2nid(p7->type);
|
|
const PKCS7_CTX *ctx = pkcs7_get0_ctx(p7);
|
|
|
|
if (ctype_nid == NID_pkcs7_signed)
|
|
mdalgs = p7->d.sign->md_algs;
|
|
else
|
|
mdalgs = NULL;
|
|
|
|
flags ^= SMIME_OLDMIME;
|
|
|
|
return SMIME_write_ASN1_with_libctx(bio, (ASN1_VALUE *)p7, data, flags,
|
|
ctype_nid, NID_undef, mdalgs,
|
|
ASN1_ITEM_rptr(PKCS7),
|
|
pkcs7_ctx_get0_libctx(ctx),
|
|
pkcs7_ctx_get0_propq(ctx));
|
|
}
|
|
|
|
PKCS7 *SMIME_read_PKCS7_ex(BIO *bio, BIO **bcont, PKCS7 **p7)
|
|
{
|
|
PKCS7 *ret;
|
|
|
|
ret = (PKCS7 *)SMIME_read_ASN1_ex(bio, bcont, ASN1_ITEM_rptr(PKCS7),
|
|
(ASN1_VALUE **)p7);
|
|
if (ret != NULL && p7 != NULL)
|
|
pkcs7_resolve_libctx(ret);
|
|
return ret;
|
|
}
|
|
|
|
PKCS7 *SMIME_read_PKCS7(BIO *bio, BIO **bcont)
|
|
{
|
|
return SMIME_read_PKCS7_ex(bio, bcont, NULL);
|
|
}
|