diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-18 15:41:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-18 15:41:14 -0400 |
| commit | 19d6650f8175744a8bd0153201ddc7d222a925af (patch) | |
| tree | c4049931281d411f9967cda1c142b692a8bcc027 | |
| parent | c8c86c9b231af2eebd9ee62396228ac946fd814f (diff) | |
| parent | eff1cfaaf7bf82aefd16b39922b1297e2f8ce2c9 (diff) | |
| download | tor-19d6650f8175744a8bd0153201ddc7d222a925af.tar.gz tor-19d6650f8175744a8bd0153201ddc7d222a925af.zip | |
Merge remote-tracking branch 'origin/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 f13319d11a..1b5b558a6f 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2968,6 +2968,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) |