diff options
| -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 eb1af30daa..67d36d73c2 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> |