aboutsummaryrefslogtreecommitdiff
path: root/src/app/main
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-11-02 18:46:35 -0400
committerNick Mathewson <nickm@torproject.org>2018-11-05 09:22:02 -0500
commit32b23a4c40880591ecadab59f932f4a4c1e7560a (patch)
tree49e041271aef000cd3b2264909905bed1ee026d2 /src/app/main
parent019a044e5e6586fb42a171cb98aea15a72bd5a13 (diff)
downloadtor-32b23a4c40880591ecadab59f932f4a4c1e7560a.tar.gz
tor-32b23a4c40880591ecadab59f932f4a4c1e7560a.zip
Make tortls use the subsystems interface
This one only needs a shutdown right now.
Diffstat (limited to 'src/app/main')
-rw-r--r--src/app/main/main.c1
-rw-r--r--src/app/main/subsystem_list.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/app/main/main.c b/src/app/main/main.c
index 6240609ee6..4dedae9c0c 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -776,7 +776,6 @@ tor_free_all(int postfork)
policies_free_all();
}
if (!postfork) {
- tor_tls_free_all();
#ifndef _WIN32
tor_getpwnam(NULL);
#endif
diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c
index e47b05da15..62c87005c6 100644
--- a/src/app/main/subsystem_list.c
+++ b/src/app/main/subsystem_list.c
@@ -16,6 +16,7 @@
#include "lib/process/winprocess_sys.h"
#include "lib/thread/thread_sys.h"
#include "lib/time/time_sys.h"
+#include "lib/tls/tortls_sys.h"
#include "lib/wallclock/wallclock_sys.h"
#include <stddef.h>
@@ -33,6 +34,7 @@ const subsys_fns_t *tor_subsystems[] = {
&sys_network,
&sys_compress,
&sys_crypto,
+ &sys_tortls,
};
const unsigned n_tor_subsystems = ARRAY_LENGTH(tor_subsystems);