diff options
Diffstat (limited to 'patches/pkcs7.h.patch')
-rw-r--r-- | patches/pkcs7.h.patch | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/patches/pkcs7.h.patch b/patches/pkcs7.h.patch index fa8b297..4c6f6ba 100644 --- a/patches/pkcs7.h.patch +++ b/patches/pkcs7.h.patch | |||
@@ -1,15 +1,17 @@ | |||
1 | --- include/openssl/pkcs7.h.orig 2015-07-06 13:26:27.369203527 -0700 | 1 | --- include/openssl/pkcs7.h.orig 2015-07-06 13:26:27.369203527 -0700 |
2 | +++ include/openssl/pkcs7.h 2015-07-06 13:27:37.637051967 -0700 | 2 | +++ include/openssl/pkcs7.h 2015-07-06 13:27:37.637051967 -0700 |
3 | @@ -69,6 +69,16 @@ | 3 | @@ -69,6 +69,18 @@ |
4 | extern "C" { | 4 | extern "C" { |
5 | #endif | 5 | #endif |
6 | 6 | ||
7 | +#if defined(_WIN32) && defined(__WINCRYPT_H__) | 7 | +#if defined(_WIN32) && defined(__WINCRYPT_H__) |
8 | +#ifndef LIBRESSL_INTERNAL | ||
8 | +#ifdef _MSC_VER | 9 | +#ifdef _MSC_VER |
9 | +#pragma message("Warning, overriding WinCrypt defines") | 10 | +#pragma message("Warning, overriding WinCrypt defines") |
10 | +#else | 11 | +#else |
11 | +#warning overriding WinCrypt defines | 12 | +#warning overriding WinCrypt defines |
12 | +#endif | 13 | +#endif |
14 | +#endif | ||
13 | +#undef PKCS7_ISSUER_AND_SERIAL | 15 | +#undef PKCS7_ISSUER_AND_SERIAL |
14 | +#undef PKCS7_SIGNER_INFO | 16 | +#undef PKCS7_SIGNER_INFO |
15 | +#endif | 17 | +#endif |