| Andrew Hsieh | 61aa94b | 2014-05-07 20:01:28 +0800 | [diff] [blame] | 1 | From e7d931119b81d514d8f0645b5453ec16c441b3db Mon Sep 17 00:00:00 2001 |
| 2 | From: Andrew Hsieh <andrewhsieh@google.com> |
| 3 | Date: Wed, 7 May 2014 20:01:28 +0800 |
| 4 | Subject: [PATCH] Undef OCSP_REQUEST, X509_NAME and OCSP_RESPONSE |
| 5 | |
| 6 | prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/mingw/include/wincrypt.h |
| 7 | define all as constants, but ocsp.h use them as type/function names |
| 8 | |
| 9 | Change-Id: I580b55a36575c1b19df6e7f3adaf90e7c345e46f |
| 10 | --- |
| 11 | crypto/ocsp/ocsp.h | 7 +++++++ |
| 12 | 1 file changed, 7 insertions(+) |
| 13 | |
| 14 | diff --git a/crypto/ocsp/ocsp.h b/crypto/ocsp/ocsp.h |
| 15 | index 31e4574..f14e9f7 100644 |
| 16 | --- a/crypto/ocsp/ocsp.h |
| 17 | +++ b/crypto/ocsp/ocsp.h |
| 18 | @@ -90,6 +90,13 @@ extern "C" { |
| 19 | #define OCSP_RESPID_KEY 0x400 |
| 20 | #define OCSP_NOTIME 0x800 |
| 21 | |
| 22 | +#ifdef OPENSSL_SYS_WIN32 |
| 23 | + /* Under Win32 these are defined in wincrypt.h */ |
| 24 | +#undef OCSP_REQUEST |
| 25 | +#undef X509_NAME |
| 26 | +#undef OCSP_RESPONSE |
| 27 | +#endif |
| 28 | + |
| 29 | /* CertID ::= SEQUENCE { |
| 30 | * hashAlgorithm AlgorithmIdentifier, |
| 31 | * issuerNameHash OCTET STRING, -- Hash of Issuer's DN |
| 32 | -- |
| 33 | 1.9.1.423.g4596e3a |
| 34 | |