From cbb1e8b1b47d23d60d1672f412e831bd3bca7ce4 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Mon, 6 Apr 2026 08:18:19 +0000
Subject: cms_local.h: remove #ifdef X509V3_HEADER_H

All thirteen files including cms_local.h do that after including cms.h,
which already includes x509v3.h, so this is always defined. While here
make the cms_local.h a bit more selfstanding by including asn1.h and
x509v3.h

ok bcook jsing (who had the same diff) kenjiro
---
 src/lib/libcrypto/cms/cms_local.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/lib/libcrypto/cms')

diff --git a/src/lib/libcrypto/cms/cms_local.h b/src/lib/libcrypto/cms/cms_local.h
index 6be60e9047..f8e8b56e18 100644
--- a/src/lib/libcrypto/cms/cms_local.h
+++ b/src/lib/libcrypto/cms/cms_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_local.h,v 1.6 2024/05/19 07:12:50 jsg Exp $ */
+/* $OpenBSD: cms_local.h,v 1.7 2026/04/06 08:18:19 tb Exp $ */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
@@ -55,7 +55,9 @@
 #ifndef HEADER_CMS_LOCAL_H
 #define HEADER_CMS_LOCAL_H
 
+#include <openssl/asn1.h>
 #include <openssl/x509.h>
+#include <openssl/x509v3.h>
 
 /*
  * Cryptographic message syntax (CMS) structures: taken from RFC3852
@@ -364,8 +366,6 @@ struct CMS_OtherKeyAttribute_st {
 
 /* ESS structures */
 
-#ifdef HEADER_X509V3_H
-
 struct CMS_ReceiptRequest_st {
 	ASN1_OCTET_STRING *signedContentIdentifier;
 	CMS_ReceiptsFrom *receiptsFrom;
@@ -379,7 +379,6 @@ struct CMS_ReceiptsFrom_st {
 		STACK_OF(GENERAL_NAMES) *receiptList;
 	} d;
 };
-#endif
 
 struct CMS_Receipt_st {
 	long version;
-- 
cgit v1.2.3-55-g6feb