[or-cvs] r15533: fix for bug 704; found by sjmurdoch. Windows and recent open (in tor/trunk: . src/common)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-06-28 00:16:17 -0400 (Sat, 28 Jun 2008)
New Revision: 15533

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/common/crypto.c
Log:
 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.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r16587] on 49666b30-7950-49c5-bedf-9dc8f3168102

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-06-28 03:13:18 UTC (rev 15532)
+++ tor/trunk/ChangeLog	2008-06-28 04:16:17 UTC (rev 15533)
@@ -7,6 +7,8 @@
     - 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

Modified: tor/trunk/src/common/crypto.c
===================================================================
--- tor/trunk/src/common/crypto.c	2008-06-28 03:13:18 UTC (rev 15532)
+++ tor/trunk/src/common/crypto.c	2008-06-28 04:16:17 UTC (rev 15533)
@@ -21,6 +21,9 @@
 #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>