From 3ec25c2410bfd42e242120f1a3570edc654e2ed9 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sat, 28 Jun 2008 04:16:17 +0000 Subject: [PATCH] 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 --- ChangeLog | 2 ++ src/common/crypto.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index f18eb87d14..0456a842e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/src/common/crypto.c b/src/common/crypto.c index eb1af30daa..67d36d73c2 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -21,6 +21,9 @@ const char crypto_c_id[] = #define WIN32_LEAN_AND_MEAN #include #include +/* Windows defines this; so does openssl 0.9.8h and later. We don't actually + * use either definition. */ +#undef OCSP_RESPONSE #endif #include