torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

When enabling NSS, disable OpenSSL.

Browse Source 
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:
Nick Mathewson
2018-08-12 17:18:41 -04:00
parent 1992c76130
commit 6a88d8f6b4
24 changed files with 170 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/include.am
+1 -1
View File
@@ -118,7 +118,6 @@ src_test_test_SOURCES += \
src/test/test_controller_events.c \
src/test/test_crypto.c \
src/test/test_crypto_ope.c \
src/test/test_crypto_openssl.c \
src/test/test_data.c \
src/test/test_dir.c \
src/test/test_dir_common.c \
@@ -189,6 +188,7 @@ if USE_NSS
# ...
else
src_test_test_SOURCES += \
src/test/test_crypto_openssl.c \
src/test/test_tortls_openssl.c
endif