summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug66734
-rw-r--r--src/common/crypto.c6
2 files changed, 10 insertions, 0 deletions
diff --git a/changes/bug6673 b/changes/bug6673
new file mode 100644
index 0000000000..506b449892
--- /dev/null
+++ b/changes/bug6673
@@ -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.
diff --git a/src/common/crypto.c b/src/common/crypto.c
index cfa11cbaa8..949fd52eb2 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -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)