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_init.h | |
| 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_init.h')
| -rw-r--r-- | src/lib/crypt_ops/crypto_init.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/crypt_ops/crypto_init.h b/src/lib/crypt_ops/crypto_init.h index 3e32456b5c..05b281720c 100644 --- a/src/lib/crypt_ops/crypto_init.h +++ b/src/lib/crypt_ops/crypto_init.h @@ -26,4 +26,8 @@ void crypto_thread_cleanup(void); int crypto_global_cleanup(void); void crypto_postfork(void); +const char *crypto_get_library_name(void); +const char *crypto_get_library_version_string(void); +const char *crypto_get_header_version_string(void); + #endif /* !defined(TOR_CRYPTO_H) */ |