mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
When enabling NSS, disable OpenSSL.
We used to link both libraries at once, but now that I'm working on TLS, there's nothing left to keep OpenSSL around for when NSS is enabled. Note that this patch causes a couple of places that still assumed OpenSSL to be disabled when NSS is enabled - tor-gencert - pbkdf2
This commit is contained in:
@@ -3504,10 +3504,11 @@ tor_init(int argc, char *argv[])
|
||||
const char *version = get_version();
|
||||
|
||||
log_notice(LD_GENERAL, "Tor %s running on %s with Libevent %s, "
|
||||
"OpenSSL %s, Zlib %s, Liblzma %s, and Libzstd %s.", version,
|
||||
"%s %s, Zlib %s, Liblzma %s, and Libzstd %s.", version,
|
||||
get_uname(),
|
||||
tor_libevent_get_version_str(),
|
||||
crypto_openssl_get_version_str(),
|
||||
crypto_get_library_name(),
|
||||
crypto_get_library_version_string(),
|
||||
tor_compress_supports_method(ZLIB_METHOD) ?
|
||||
tor_compress_version_str(ZLIB_METHOD) : "N/A",
|
||||
tor_compress_supports_method(LZMA_METHOD) ?
|
||||
|
||||
Reference in New Issue
Block a user