Commit 3ec25c24 authored by Nick Mathewson's avatar Nick Mathewson 🏃
Browse files

r16587@tombo: nickm | 2008-06-28 00:13:40 -0400

 fix for bug 704; found by sjmurdoch.  Windows and recent openssl both want to define OCSP_RESPONSE; do not let them.


svn:r15533
parent 5b25352b
......@@ -7,6 +7,8 @@ Changes in version 0.2.1.3-alpha - 2008-06-xx
- Change the contrib/tor.logrotate script so it makes the new
logs as "_tor:_tor" rather than the default, which is generally
"root:wheel". Fixes bug 676, reported by Serge Koksharov.
- Fix macro collision between OpenSSL 0.9.8h and Windows headers.
Fixes bug 704; fix from Steven Murdoch.
Changes in version 0.2.1.2-alpha - 2008-06-20
......
......@@ -21,6 +21,9 @@ const char crypto_c_id[] =
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <wincrypt.h>
/* Windows defines this; so does openssl 0.9.8h and later. We don't actually
* use either definition. */
#undef OCSP_RESPONSE
#endif
#include <openssl/err.h>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment