[or-cvs] r15534: Backport fix for bug 704; found by sjmurdoch. Windows and re (in tor/branches/tor-0_2_0-patches: . src/common)

[nickm at seul.org]

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

Modified:
   tor/branches/tor-0_2_0-patches/
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/common/crypto.c
Log:
 r16588 at tombo:  nickm | 2008-06-28 00:15:45 -0400
 Backport 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/branches/tor-0_2_0-patches
___________________________________________________________________
 svk:merge ticket from /tor/020 [r16588] on 49666b30-7950-49c5-bedf-9dc8f3168102

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-06-28 04:16:17 UTC (rev 15533)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-06-28 04:16:44 UTC (rev 15534)
@@ -17,6 +17,8 @@
     - Enable cannibalization of circuits for introduction circuits and
       actually use introduction circuits that originate from
       cannibalization afterwards.
+    - Fix macro collision between OpenSSL 0.9.8h and Windows headers.
+      Fixes bug 704; fix from Steven Murdoch.
 
 
 Changes in version 0.2.0.28-rc - 2008-06-13

Modified: tor/branches/tor-0_2_0-patches/src/common/crypto.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/common/crypto.c	2008-06-28 04:16:17 UTC (rev 15533)
+++ tor/branches/tor-0_2_0-patches/src/common/crypto.c	2008-06-28 04:16:44 UTC (rev 15534)
@@ -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>