[gnurl] 35/411: openssl: Fix wincrypt symbols conflict with BoringSSL

[gnunet]

This is an automated email from the git hooks/post-receive script.

nikita pushed a commit to branch master
in repository gnurl.

commit fbe07c6829ba8c5793c84c2856526e19e9029ab9
Author: Jay Satiro <raysatiro@yahoo.com>
AuthorDate: Wed Aug 26 01:49:47 2020 -0400

    openssl: Fix wincrypt symbols conflict with BoringSSL
    
    OpenSSL undefines the conflicting symbols but BoringSSL does not so we
    must do it ourselves.
    
    Reported-by: Samuel Tranchet
    Assisted-by: Javier Blazquez
    
    Ref: https://bugs.chromium.org/p/boringssl/issues/detail?id=371
    Ref: 
https://github.com/openssl/openssl/blob/OpenSSL_1_1_1g/include/openssl/ossl_typ.h#L66-L73
    
    Fixes https://github.com/curl/curl/issues/5669
    Closes https://github.com/curl/curl/pull/5857
---
 lib/vtls/openssl.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 4bfd040d3..25b7dfab8 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -34,6 +34,13 @@
 /* Wincrypt must be included before anything that could include OpenSSL. */
 #if defined(USE_WIN32_CRYPTO)
 #include <wincrypt.h>
+/* 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
 
 #include "urldata.h"

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.