diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-08-12 17:18:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-08-21 12:25:33 -0400 |
| commit | 6a88d8f6b413efdac4b0176cfb78431be46ca9e0 (patch) | |
| tree | 873962eaa3b6ac1f5ad4d5a2532dec8d108ec080 /src/lib/crypt_ops/crypto_util.c | |
| parent | 1992c761308538cffea64abecc9e45cbd47b1bda (diff) | |
| download | tor-6a88d8f6b413efdac4b0176cfb78431be46ca9e0.tar.gz tor-6a88d8f6b413efdac4b0176cfb78431be46ca9e0.zip | |
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
Diffstat (limited to 'src/lib/crypt_ops/crypto_util.c')
| -rw-r--r-- | src/lib/crypt_ops/crypto_util.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/crypt_ops/crypto_util.c b/src/lib/crypt_ops/crypto_util.c index a645321bfb..7af80291ef 100644 --- a/src/lib/crypt_ops/crypto_util.c +++ b/src/lib/crypt_ops/crypto_util.c @@ -23,12 +23,14 @@ #include <wincrypt.h> #endif /* defined(_WIN32) */ -DISABLE_GCC_WARNING(redundant-decls) +#include <stdlib.h> +#ifdef ENABLE_OPENSSL +DISABLE_GCC_WARNING(redundant-decls) #include <openssl/err.h> #include <openssl/crypto.h> - ENABLE_GCC_WARNING(redundant-decls) +#endif #include "lib/log/log.h" #include "lib/log/util_bug.h" |