diff options
| author | Bob Beck <[email protected]> | 2026-08-07 18:51:05 +0200 |
|---|---|---|
| committer | Tomas Mraz <[email protected]> | 2026-09-01 15:56:25 +0200 |
| commit | 2df3cbc19dfecff99e166c42bdfb0ca2b49ba5be (patch) | |
| tree | 7ee54e638a58bb22208687a1b6b3681aafb863f5 /include | |
| parent | Do the NDEF streaming setup in the ASN.1 layer, not in CMS and PKCS7 (diff) | |
| download | openssl-2df3cbc19dfecff99e166c42bdfb0ca2b49ba5be.tar.gz openssl-2df3cbc19dfecff99e166c42bdfb0ca2b49ba5be.zip | |
Deprecate CMS_stream() and PKCS7_stream()
These set up the indefinite length streaming used by BIO_new_NDEF(), which
now obtains the content octet string through the ASN.1 callback, so they
no longer return a streaming boundary and have no use outside the library.
Neither has ever been documented, so there is no manual page to update.
Reviewed-by: Andrew Dinh <[email protected]>
Reviewed-by: Viktor Dukhovni <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
Merge-date: Tue Sep 1 13:56:43 2026
Merged-from: https://github.com/openssl/openssl/pull/32242
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/cms.h.in | 4 | ||||
| -rw-r--r-- | include/openssl/pkcs7.h.in | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/openssl/cms.h.in b/include/openssl/cms.h.in index 8389d3dff08..b7e8d723035 100644 --- a/include/openssl/cms.h.in +++ b/include/openssl/cms.h.in @@ -124,7 +124,9 @@ int CMS_set_detached(CMS_ContentInfo *cms, int detached); #ifdef OPENSSL_PEM_H DECLARE_PEM_rw(CMS, CMS_ContentInfo) #endif -int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms); +#if !defined(OPENSSL_NO_DEPRECATED_4_1) +OSSL_DEPRECATEDIN_4_1 int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms); +#endif /* !defined(OPENSSL_NO_DEPRECATED_4_1) */ CMS_ContentInfo *d2i_CMS_bio(BIO *bp, CMS_ContentInfo **cms); int i2d_CMS_bio(BIO *bp, CMS_ContentInfo *cms); diff --git a/include/openssl/pkcs7.h.in b/include/openssl/pkcs7.h.in index e922bf6d4a0..f0b1c13de95 100644 --- a/include/openssl/pkcs7.h.in +++ b/include/openssl/pkcs7.h.in @@ -303,7 +303,9 @@ void PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc); int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri); int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509); int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher); -int PKCS7_stream(unsigned char ***boundary, PKCS7 *p7); +#if !defined(OPENSSL_NO_DEPRECATED_4_1) +OSSL_DEPRECATEDIN_4_1 int PKCS7_stream(unsigned char ***boundary, PKCS7 *p7); +#endif /* !defined(OPENSSL_NO_DEPRECATED_4_1) */ PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx); ASN1_OCTET_STRING *PKCS7_get_octet_string(PKCS7 *p7); |