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

diff --git a/ChangeLog b/ChangeLog
index f18eb87d146909de0a16a0c3a8eb9a864ca02eb6..0456a842e12c6ea1be0538ec0afcc7d2ed9f0a75 100644 (file)
--- 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 eb1af30daa1bca9fa2c30868fbee70cb9b24727a..67d36d73c2cc43360a395f07aea621c4363ae3ed 100644 (file)
--- 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 <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>