sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Nick Mathewson 2008-06-28 04:16:44 +00:00
parent 706d1b31a9
commit d5046d7299
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

@ -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

3
src/common/crypto.c
View File

@ -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>