Merge topic 'libarchive-wincrypt-boringssl'

5752bb41e3 libarchive: Avoid preprocessor symbol conflicts with boringssl on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12019

Utilities/cmlibarchive/libarchive/archive_digest_private.h

diff --git a/Utilities/cmlibarchive/libarchive/archive_digest_private.h b/Utilities/cmlibarchive/libarchive/archive_digest_private.h
index deb134e..5518799 100644
--- a/Utilities/cmlibarchive/libarchive/archive_digest_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_digest_private.h
@@ -177,6 +177,13 @@
 #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;