diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-06-28 04:16:17 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-06-28 04:16:17 +0000 |
| commit | 3ec25c2410bfd42e242120f1a3570edc654e2ed9 (patch) | |
| tree | 3946f2967147d57f8c5ed30db7ff91870d71b0c8 | |
| parent | 5b25352bf689cd3138b0291573f1c5ed2baa8e11 (diff) | |
| download | tor-3ec25c2410bfd42e242120f1a3570edc654e2ed9.tar tor-3ec25c2410bfd42e242120f1a3570edc654e2ed9.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/common/crypto.c | 3 |
2 files changed, 5 insertions, 0 deletions
@@ -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 eb1af30da..67d36d73c 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> |