diff options
| author | Scott Parker <scottp.sk8@gmail.com> | 2015-07-06 13:42:54 -0700 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2015-07-16 13:09:42 -0500 |
| commit | 0bab46dde22f6096ad85df4dd39a0f01758d234f (patch) | |
| tree | 98d6c0d248665c85d1e7c4e3347545946c92c97f /patches/pkcs7.h.patch | |
| parent | b9291face3ec7c804b6171857f95594d12384706 (diff) | |
| download | portable-0bab46dde22f6096ad85df4dd39a0f01758d234f.tar.gz portable-0bab46dde22f6096ad85df4dd39a0f01758d234f.tar.bz2 portable-0bab46dde22f6096ad85df4dd39a0f01758d234f.zip | |
patch headers to avoid redefinitions on windows
Diffstat (limited to 'patches/pkcs7.h.patch')
| -rw-r--r-- | patches/pkcs7.h.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/pkcs7.h.patch b/patches/pkcs7.h.patch new file mode 100644 index 0000000..fa8b297 --- /dev/null +++ b/patches/pkcs7.h.patch | |||
| @@ -0,0 +1,19 @@ | |||
| 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 | ||
| 3 | @@ -69,6 +69,16 @@ | ||
| 4 | extern "C" { | ||
| 5 | #endif | ||
| 6 | |||
| 7 | +#if defined(_WIN32) && defined(__WINCRYPT_H__) | ||
| 8 | +#ifdef _MSC_VER | ||
| 9 | +#pragma message("Warning, overriding WinCrypt defines") | ||
| 10 | +#else | ||
| 11 | +#warning overriding WinCrypt defines | ||
| 12 | +#endif | ||
| 13 | +#undef PKCS7_ISSUER_AND_SERIAL | ||
| 14 | +#undef PKCS7_SIGNER_INFO | ||
| 15 | +#endif | ||
| 16 | + | ||
| 17 | /* | ||
| 18 | Encryption_ID DES-CBC | ||
| 19 | Digest_ID MD5 | ||