Commit eff1cfaa authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

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

parents ad8a27a3 fdafe11a

changes/bug6673

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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.

src/common/crypto.c

+6 −0
Original line number Diff line number Diff line
@@ -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)