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 /include | |
| 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 'include')
| -rw-r--r-- | include/openssl/asn1.h.in | 2 | ||||
| -rw-r--r-- | include/openssl/cms.h.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/openssl/asn1.h.in b/include/openssl/asn1.h.in index 0ee82e7d58..36abcff28c 100644 --- a/include/openssl/asn1.h.in +++ b/include/openssl/asn1.h.in @@ -919,7 +919,7 @@ int SMIME_write_ASN1_ex(BIO *bio, ASN1_VALUE *val, BIO *data, int flags, STACK_OF(X509_ALGOR) *mdalgs, const ASN1_ITEM *it, OSSL_LIB_CTX *libctx, const char *propq); ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it); -ASN1_VALUE *SMIME_read_ASN1_ex(BIO *bio, BIO **bcont, const ASN1_ITEM *it, +ASN1_VALUE *SMIME_read_ASN1_ex(BIO *bio, int flags, BIO **bcont, const ASN1_ITEM *it, ASN1_VALUE **x); int SMIME_crlf_copy(BIO *in, BIO *out, int flags); int SMIME_text(BIO *in, BIO *out); diff --git a/include/openssl/cms.h.in b/include/openssl/cms.h.in index 451191b796..da20ddf2f4 100644 --- a/include/openssl/cms.h.in +++ b/include/openssl/cms.h.in @@ -114,7 +114,7 @@ int i2d_CMS_bio_stream(BIO *out, CMS_ContentInfo *cms, BIO *in, int flags); int PEM_write_bio_CMS_stream(BIO *out, CMS_ContentInfo *cms, BIO *in, int flags); CMS_ContentInfo *SMIME_read_CMS(BIO *bio, BIO **bcont); -CMS_ContentInfo *SMIME_read_CMS_ex(BIO *bio, BIO **bcont, CMS_ContentInfo **ci); +CMS_ContentInfo *SMIME_read_CMS_ex(BIO *bio, int flags, BIO **bcont, CMS_ContentInfo **ci); int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags); int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont, |