From 8de06d5437596e81478fc41464a92eaa5c2862fb Mon Sep 17 00:00:00 2001 From: jsing Date: Fri, 29 Mar 2024 02:28:50 +0000 Subject: [PATCH] Stop playing #ifdef HEADER_PEM_H games in cms.h. Rather than making prototypes appear and disappear depending on whether or not you've included pem.h before cms.h, just include pem.h from cms.h itself. ok joshua@ tb@ --- lib/libcrypto/cms/cms.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libcrypto/cms/cms.h b/lib/libcrypto/cms/cms.h index 76672af0979..75983cee3e8 100644 --- a/lib/libcrypto/cms/cms.h +++ b/lib/libcrypto/cms/cms.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cms.h,v 1.16 2023/07/28 10:28:02 tb Exp $ */ +/* $OpenBSD: cms.h,v 1.17 2024/03/29 02:28:50 jsing Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -58,8 +58,11 @@ #include #ifndef OPENSSL_NO_CMS + +#include #include #include + #ifdef __cplusplus extern "C" { #endif @@ -138,14 +141,12 @@ ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms); int CMS_is_detached(CMS_ContentInfo *cms); int CMS_set_detached(CMS_ContentInfo *cms, int detached); -#ifdef HEADER_PEM_H CMS_ContentInfo *PEM_read_bio_CMS(BIO *bp, CMS_ContentInfo **x, pem_password_cb *cb, void *u); CMS_ContentInfo *PEM_read_CMS(FILE *fp, CMS_ContentInfo **x, pem_password_cb *cb, void *u); int PEM_write_bio_CMS(BIO *bp, const CMS_ContentInfo *x); int PEM_write_CMS(FILE *fp, const CMS_ContentInfo *x); -#endif int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms); CMS_ContentInfo *d2i_CMS_bio(BIO *bp, CMS_ContentInfo **cms); int i2d_CMS_bio(BIO *bp, CMS_ContentInfo *cms); -- 2.20.1