[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 77/163: boringssl + schannel: undef X509_NAME in li
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 77/163: boringssl + schannel: undef X509_NAME in lib/schannel.h |
Date: |
Sun, 05 Aug 2018 12:36:43 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 274940d7438af7ef92ce3e11d75620db94675932
Author: Gisle Vanem <address@hidden>
AuthorDate: Fri Jun 8 15:10:05 2018 +0200
boringssl + schannel: undef X509_NAME in lib/schannel.h
Fixes the build problem when both boringssl and schannel are enabled.
Fixes #2634
Closes #2643
---
lib/ldap.c | 9 ---------
lib/vtls/schannel.h | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/lib/ldap.c b/lib/ldap.c
index 89047bcbd..4d8f4fa28 100644
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -54,15 +54,6 @@
# endif /* HAVE_LDAP_SSL && HAVE_LDAP_SSL_H */
#endif
-/* These are macros in both <wincrypt.h> (in above <winldap.h>) and typedefs
- * in BoringSSL's <openssl/x509.h>
- */
-#ifdef HAVE_BORINGSSL
-# undef X509_NAME
-# undef X509_CERT_PAIR
-# undef X509_EXTENSIONS
-#endif
-
#include "urldata.h"
#include <curl/curl.h>
#include "sendf.h"
diff --git a/lib/vtls/schannel.h b/lib/vtls/schannel.h
index aa44e8e89..51417affe 100644
--- a/lib/vtls/schannel.h
+++ b/lib/vtls/schannel.h
@@ -32,6 +32,25 @@
#include "urldata.h"
+/* <wincrypt.h> has been included via the above <schnlsp.h>.
+ * Or in case of ldap.c, it was included via <winldap.h>.
+ * And since <wincrypt.h> has this:
+ * #define X509_NAME ((LPCSTR) 7)
+ *
+ * And in BoringSSL's <openssl/base.h> there is:
+ * typedef struct X509_name_st X509_NAME;
+ * etc.
+ *
+ * this wil cause all kinds of C-preprocessing paste errors in
+ * BoringSSL's <openssl/x509.h>: So just undefine those defines here
+ * (and only here).
+ */
+#if defined(HAVE_BORINGSSL) || defined(OPENSSL_IS_BORINGSSL)
+# undef X509_NAME
+# undef X509_CERT_PAIR
+# undef X509_EXTENSIONS
+#endif
+
extern const struct Curl_ssl Curl_ssl_schannel;
CURLcode verify_certificate(struct connectdata *conn, int sockindex);
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 114/163: CURLOPT_SSL_VERIFYPEER.3: fix syntax mistake, (continued)
- [GNUnet-SVN] [gnurl] 114/163: CURLOPT_SSL_VERIFYPEER.3: fix syntax mistake, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 117/163: url: check Curl_conncache_add_conn return code, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 144/163: CMake: Remove unused 'output_var' from 'collect_true', gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 129/163: openssl: Remove some dead code, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 150/163: schannel: make more cipher options conditional, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 162/163: gnurl: rename CURLINFO and CURLOPT section 3 manpages post-merge, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 124/163: travis: add a build using the synchronous name resolver, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 138/163: example/crawler.c: simple crawler based on libxml2, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 132/163: DEPRECATE: new doc describing planned item removals, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 135/163: DEPRECATE: linkified, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 77/163: boringssl + schannel: undef X509_NAME in lib/schannel.h,
gnunet <=
- [GNUnet-SVN] [gnurl] 121/163: easy_perform: use *multi_timeout() to get wait times, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 81/163: cppcheck: fix warnings, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 149/163: curl_setup: include <winerror.h> before <windows.h>, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 161/163: gnurl: sed script, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 163/163: gnurl: bump version in guix.scm, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 159/163: Merge tag 'curl-7_61_0', gnunet, 2018/08/05