diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-03-25 11:27:50 +0100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-03-31 10:04:44 -0400 |
| commit | e7506c03cf7e3121fb33567452039eaccd1eea50 (patch) | |
| tree | 83c9437c838894d23c39b9d9037ff831fa7e4bab /src/or/main.c | |
| parent | 04f1ddaa2a33194ba861cc38f89f16fd076c63a6 (diff) | |
| download | tor-e7506c03cf7e3121fb33567452039eaccd1eea50.tar.gz tor-e7506c03cf7e3121fb33567452039eaccd1eea50.zip | |
Isolate dmalloc/openssl bridge code to crypto.c
This makes it so main.c, and the rest of src/or, no longer need to
include any openssl headers.
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c index 5b73aea70c..4505879adc 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -104,7 +104,6 @@ #include "ext_orport.h" #ifdef USE_DMALLOC #include <dmalloc.h> -#include <openssl/crypto.h> #endif #include "memarea.h" #include "sandbox.h" @@ -3617,8 +3616,8 @@ tor_main(int argc, char *argv[]) { /* Instruct OpenSSL to use our internal wrappers for malloc, realloc and free. */ - int r = CRYPTO_set_mem_ex_functions(tor_malloc_, tor_realloc_, tor_free_); - tor_assert(r); + int r = crypto_use_tor_alloc_functions(); + tor_assert(r == 0); } #endif #ifdef NT_SERVICE |