From e14431110e933086160f0a8c24c7885e0b301d27 Mon Sep 17 00:00:00 2001 From: Peter Gusev Date: Wed, 19 Oct 2022 12:15:38 +0200 Subject: [PATCH] fix: undef crypto macro defined by wincrypt.h when SSL is enabled --- lib/plat/windows/private-lib-plat-windows.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/plat/windows/private-lib-plat-windows.h b/lib/plat/windows/private-lib-plat-windows.h index 18d87ac251..ce03b7a5af 100644 --- a/lib/plat/windows/private-lib-plat-windows.h +++ b/lib/plat/windows/private-lib-plat-windows.h @@ -70,6 +70,15 @@ #if defined(LWS_WITH_TLS) #include +#if defined(LWS_WITH_BORINGSSL) +/* Undefine wincrypt conflicting symbols for BoringSSL. */ +#undef X509_NAME +#undef X509_EXTENSIONS +#undef PKCS7_ISSUER_AND_SERIAL +#undef PKCS7_SIGNER_INFO +#undef OCSP_REQUEST +#undef OCSP_RESPONSE +#endif #endif #if defined(LWS_HAVE_PTHREAD_H)