nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-02 16:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

r16587@tombo: nickm | 2008-06-28 00:13:40 -0400

Browse Source 
fix for bug 704; found by sjmurdoch.  Windows and recent openssl both want to define OCSP_RESPONSE; do not let them.


svn:r15533
This commit is contained in:
Nick Mathewson 2008-06-28 04:16:17 +00:00
parent 5b25352bf6
commit 3ec25c2410
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -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 - Change the contrib/tor.logrotate script so it makes the new
logs as "_tor:_tor" rather than the default, which is generally logs as "_tor:_tor" rather than the default, which is generally
"root:wheel". Fixes bug 676, reported by Serge Koksharov. "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 Changes in version 0.2.1.2-alpha - 2008-06-20

3
src/common/crypto.c
View File

@ -21,6 +21,9 @@ const char crypto_c_id[] =
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <wincrypt.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 #endif
#include <openssl/err.h> #include <openssl/err.h>