patch headers to avoid redefinitions on windows

2015-07-06 13:42:54 -07:00
parent b9291face3
commit 0bab46dde2
4 changed files with 65 additions and 0 deletions
--- a/patches/pkcs7.h.patch
+++ b/patches/pkcs7.h.patch
@@ -0,0 +1,19 @@
+--- include/openssl/pkcs7.h.orig	2015-07-06 13:26:27.369203527 -0700
+++ include/openssl/pkcs7.h	2015-07-06 13:27:37.637051967 -0700
+@@ -69,6 +69,16 @@
+ extern "C" {
+ #endif
+
+#if defined(_WIN32) && defined(__WINCRYPT_H__)
+#ifdef _MSC_VER
+#pragma message("Warning, overriding WinCrypt defines")
+#else
+#warning overriding WinCrypt defines
+#endif
+#undef PKCS7_ISSUER_AND_SERIAL
+#undef PKCS7_SIGNER_INFO
+#endif
+
+ /*
+ Encryption_ID		DES-CBC
+ Digest_ID		MD5