diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-09-23 10:17:58 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2021-05-19 09:23:30 +0200 |
| commit | 7c701c590d4b368fedf5dad222b4f3b8103b2381 (patch) | |
| tree | 8b342cf7ff52d2bc36229945882fbce8a9a89cb3 /crypto/cms | |
| parent | 184238794fe52353f5e042fa9b943fbc59a5b9cb (diff) | |
Make SMIME_read_CMS_ex() and SMIME_read_ASN1_ex() support binary input
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12959)
Diffstat (limited to 'crypto/cms')
| -rw-r--r-- | crypto/cms/cms_io.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/cms/cms_io.c b/crypto/cms/cms_io.c index 6b71ddfa90..9c260d0904 100644 --- a/crypto/cms/cms_io.c +++ b/crypto/cms/cms_io.c @@ -90,11 +90,11 @@ int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags) ossl_cms_ctx_get0_propq(ctx)); } -CMS_ContentInfo *SMIME_read_CMS_ex(BIO *bio, BIO **bcont, CMS_ContentInfo **cms) +CMS_ContentInfo *SMIME_read_CMS_ex(BIO *bio, int flags, BIO **bcont, CMS_ContentInfo **cms) { CMS_ContentInfo *ci; - ci = (CMS_ContentInfo *)SMIME_read_ASN1_ex(bio, bcont, + ci = (CMS_ContentInfo *)SMIME_read_ASN1_ex(bio, flags, bcont, ASN1_ITEM_rptr(CMS_ContentInfo), (ASN1_VALUE **)cms); if (ci != NULL) @@ -104,5 +104,5 @@ CMS_ContentInfo *SMIME_read_CMS_ex(BIO *bio, BIO **bcont, CMS_ContentInfo **cms) CMS_ContentInfo *SMIME_read_CMS(BIO *bio, BIO **bcont) { - return SMIME_read_CMS_ex(bio, bcont, NULL); + return SMIME_read_CMS_ex(bio, 0, bcont, NULL); } |