diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-06-28 04:16:44 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-06-28 04:16:44 +0000 |
| commit | d5046d72994ab7570ae498e7244df5d5551bbe3d (patch) | |
| tree | de595dc812e085d1221c1d5642e222b7eef8da31 | |
| parent | 706d1b31a942087c825b196316c3d192073c9629 (diff) | |
| download | tor-d5046d72994ab7570ae498e7244df5d5551bbe3d.tar.gz tor-d5046d72994ab7570ae498e7244df5d5551bbe3d.zip | |
r16588@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.
svn:r15534
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/common/crypto.c | 3 |
2 files changed, 5 insertions, 0 deletions
@@ -17,6 +17,8 @@ Changes in version 0.2.0.29 - 2008-06-xx - 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 diff --git a/src/common/crypto.c b/src/common/crypto.c index ea70aad4ab..16f5afef3e 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 <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> |