Merge remote-tracking branch 'public/bug6673' into maint-0.2.4

This commit is contained in:
Nick Mathewson 2013-03-18 15:40:50 -04:00
commit eff1cfaaf7
2 changed files with 10 additions and 0 deletions

4
changes/bug6673 Normal file
View file

@ -0,0 +1,4 @@
o Minor features (build):
- Detect and reject attempts to build Tor with threading support
when OpenSSL have been compiled with threading support disabled.
Fixes bug 6673.

View file

@ -2983,6 +2983,12 @@ memwipe(void *mem, uint8_t byte, size_t sz)
}
#ifdef TOR_IS_MULTITHREADED
#ifndef OPENSSL_THREADS
#error OpenSSL has been built without thread support. Tor requires an \
OpenSSL library with thread support enabled.
#endif
/** Helper: OpenSSL uses this callback to manipulate mutexes. */
static void
openssl_locking_cb_(int mode, int n, const char *file, int line)