diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/cms/cms.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/libcrypto/cms/cms.h b/src/lib/libcrypto/cms/cms.h index 76672af097..75983cee3e 100644 --- a/src/lib/libcrypto/cms/cms.h +++ b/src/lib/libcrypto/cms/cms.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: cms.h,v 1.16 2023/07/28 10:28:02 tb Exp $ */ | 1 | /* $OpenBSD: cms.h,v 1.17 2024/03/29 02:28:50 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 4 | * project. | 4 | * project. |
| @@ -58,8 +58,11 @@ | |||
| 58 | #include <openssl/opensslconf.h> | 58 | #include <openssl/opensslconf.h> |
| 59 | 59 | ||
| 60 | #ifndef OPENSSL_NO_CMS | 60 | #ifndef OPENSSL_NO_CMS |
| 61 | |||
| 62 | #include <openssl/pem.h> | ||
| 61 | #include <openssl/x509.h> | 63 | #include <openssl/x509.h> |
| 62 | #include <openssl/x509v3.h> | 64 | #include <openssl/x509v3.h> |
| 65 | |||
| 63 | #ifdef __cplusplus | 66 | #ifdef __cplusplus |
| 64 | extern "C" { | 67 | extern "C" { |
| 65 | #endif | 68 | #endif |
| @@ -138,14 +141,12 @@ ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms); | |||
| 138 | int CMS_is_detached(CMS_ContentInfo *cms); | 141 | int CMS_is_detached(CMS_ContentInfo *cms); |
| 139 | int CMS_set_detached(CMS_ContentInfo *cms, int detached); | 142 | int CMS_set_detached(CMS_ContentInfo *cms, int detached); |
| 140 | 143 | ||
| 141 | #ifdef HEADER_PEM_H | ||
| 142 | CMS_ContentInfo *PEM_read_bio_CMS(BIO *bp, CMS_ContentInfo **x, | 144 | CMS_ContentInfo *PEM_read_bio_CMS(BIO *bp, CMS_ContentInfo **x, |
| 143 | pem_password_cb *cb, void *u); | 145 | pem_password_cb *cb, void *u); |
| 144 | CMS_ContentInfo *PEM_read_CMS(FILE *fp, CMS_ContentInfo **x, | 146 | CMS_ContentInfo *PEM_read_CMS(FILE *fp, CMS_ContentInfo **x, |
| 145 | pem_password_cb *cb, void *u); | 147 | pem_password_cb *cb, void *u); |
| 146 | int PEM_write_bio_CMS(BIO *bp, const CMS_ContentInfo *x); | 148 | int PEM_write_bio_CMS(BIO *bp, const CMS_ContentInfo *x); |
| 147 | int PEM_write_CMS(FILE *fp, const CMS_ContentInfo *x); | 149 | int PEM_write_CMS(FILE *fp, const CMS_ContentInfo *x); |
| 148 | #endif | ||
| 149 | int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms); | 150 | int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms); |
| 150 | CMS_ContentInfo *d2i_CMS_bio(BIO *bp, CMS_ContentInfo **cms); | 151 | CMS_ContentInfo *d2i_CMS_bio(BIO *bp, CMS_ContentInfo **cms); |
| 151 | int i2d_CMS_bio(BIO *bp, CMS_ContentInfo *cms); | 152 | int i2d_CMS_bio(BIO *bp, CMS_ContentInfo *cms); |
