mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse source
This commit is contained in:
Nick Mathewson 2013-03-18 15:41:14 -04:00
commit 19d6650f81
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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.

6
src/common/crypto.c
View file

@ -2968,6 +2968,12 @@ memwipe(void *mem, uint8_t byte, size_t sz)
} }
#ifdef TOR_IS_MULTITHREADED #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. */ /** Helper: OpenSSL uses this callback to manipulate mutexes. */
static void static void
openssl_locking_cb_(int mode, int n, const char *file, int line) openssl_locking_cb_(int mode, int n, const char *file, int line)