From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 26 Jan 2021 10:17:20 +0000 (+0100)
Subject: openssl: Avoid conflicts with wincrypt.h on Windows
X-Git-Tag: 5.9.2dr2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55df5e979718a80015e858ca32bc2c92d08b39cf;p=thirdparty%2Fstrongswan.git

openssl: Avoid conflicts with wincrypt.h on Windows

There are several conflicts with newer versions of OpenSSL (> 1.0).
---

diff --git a/src/libstrongswan/plugins/openssl/Makefile.am b/src/libstrongswan/plugins/openssl/Makefile.am
index f488bc19ce..b1073ed5eb 100644
--- a/src/libstrongswan/plugins/openssl/Makefile.am
+++ b/src/libstrongswan/plugins/openssl/Makefile.am
@@ -2,6 +2,10 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/libstrongswan \
 	-DFIPS_MODE=${fips_mode}
 
+if USE_WINDOWS
+AM_CPPFLAGS += -DNOCRYPT
+endif
+
 AM_CFLAGS = \
 	$(PLUGIN_CFLAGS)