From 5752bb41e3b7d7bc2c0400d960e91bdab36771fa Mon Sep 17 00:00:00 2001
From: Haowei Wu <haowei@google.com>
Date: Wed, 6 May 2026 10:42:14 -0700
Subject: [PATCH] libarchive: Avoid preprocessor symbol conflicts with
 boringssl on Windows

`<wincrypt.h>` defines symbols conflicting with BoringSSL/AWS-LC.
---
 Utilities/cmlibarchive/libarchive/archive_digest_private.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Utilities/cmlibarchive/libarchive/archive_digest_private.h b/Utilities/cmlibarchive/libarchive/archive_digest_private.h
index deb134e4f8..55187990ba 100644
--- a/Utilities/cmlibarchive/libarchive/archive_digest_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_digest_private.h
@@ -177,6 +177,13 @@ typedef struct {
 #else
 #include <windows.h>
 #include <wincrypt.h>
+/* Undefine indirect <wincrypt.h> symbols conflicting with BoringSSL/AWS-LC. */
+#undef X509_NAME
+#undef X509_EXTENSIONS
+#undef PKCS7_ISSUER_AND_SERIAL
+#undef PKCS7_SIGNER_INFO
+#undef OCSP_REQUEST
+#undef OCSP_RESPONSE
 #define	ARCHIVE_CRYPTO_WINCRYPT 1
 typedef struct {
   int   valid;