mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Merge remote-tracking branch 'public/bug6673' into maint-0.2.4
This commit is contained in:
@@ -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.
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user