diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-18 15:40:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-18 15:40:50 -0400 |
| commit | eff1cfaaf7bf82aefd16b39922b1297e2f8ce2c9 (patch) | |
| tree | d33b41932fc764390331a522b4e376dae0013b53 | |
| parent | ad8a27a3939be92e94d95fd7bb0f4e4b1e03382b (diff) | |
| parent | fdafe11a25ad3e7ca8893c8630f86973431217b9 (diff) | |
| download | tor-eff1cfaaf7bf82aefd16b39922b1297e2f8ce2c9.tar.gz tor-eff1cfaaf7bf82aefd16b39922b1297e2f8ce2c9.zip | |
Merge remote-tracking branch 'public/bug6673' into maint-0.2.4
| -rw-r--r-- | changes/bug6673 | 4 | ||||
| -rw-r--r-- | src/common/crypto.c | 6 |
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) |