Переглянути джерело

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

Nick Mathewson 11 роки тому
батько
коміт
eff1cfaaf7
2 змінених файлів з 10 додано та 0 видалено
  1. 4 0
      changes/bug6673
  2. 6 0
      src/common/crypto.c

+ 4 - 0
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.

+ 6 - 0
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)