summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-02-05 10:39:55 -0500
committerDavid Goulet <dgoulet@torproject.org>2021-02-19 13:19:08 -0500
commit2444629c86e3368ebd6c9ee1b54aa5a5959fa398 (patch)
treebc28430214d97fcfe12c98534c3d653686b30478 /src/app
parent67938e019844d8143d683321faf45d7623a3a9ae (diff)
downloadtor-2444629c86e3368ebd6c9ee1b54aa5a5959fa398.tar.gz
tor-2444629c86e3368ebd6c9ee1b54aa5a5959fa398.zip
hs-v2: Remove client support
Related to #40266 Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/app')
-rw-r--r--src/app/config/config.c3
-rw-r--r--src/app/config/or_options_st.h3
-rw-r--r--src/app/main/shutdown.c2
3 files changed, 1 insertions, 7 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 1e4d18116c..dec4890e70 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -103,7 +103,7 @@
#include "feature/relay/routermode.h"
#include "feature/relay/relay_config.h"
#include "feature/relay/transport_config.h"
-#include "feature/rend/rendclient.h"
+#include "feature/rend/rendcommon.h"
#include "feature/rend/rendservice.h"
#include "lib/geoip/geoip.h"
#include "feature/stats/geoip_stats.h"
@@ -504,7 +504,6 @@ static const config_var_t option_vars_[] = {
VAR("HiddenServiceOnionBalanceInstance",
LINELIST_S, RendConfigLines, NULL),
VAR("HiddenServiceStatistics", BOOL, HiddenServiceStatistics_option, "1"),
- V(HidServAuth, LINELIST, NULL),
V(ClientOnionAuthDir, FILENAME, NULL),
OBSOLETE("CloseHSClientCircuitsImmediatelyOnTimeout"),
OBSOLETE("CloseHSServiceRendCircuitsImmediatelyOnTimeout"),
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index 714034b28d..f9c6dae2b6 100644
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -428,9 +428,6 @@ struct or_options_t {
int NumCPUs; /**< How many CPUs should we try to use? */
struct config_line_t *RendConfigLines; /**< List of configuration lines
* for rendezvous services. */
- struct config_line_t *HidServAuth; /**< List of configuration lines for
- * client-side authorizations for hidden
- * services */
char *ClientOnionAuthDir; /**< Directory to keep client
* onion service authorization secret keys */
char *ContactInfo; /**< Contact info to be published in the directory. */
diff --git a/src/app/main/shutdown.c b/src/app/main/shutdown.c
index 4a556333db..fe80a92991 100644
--- a/src/app/main/shutdown.c
+++ b/src/app/main/shutdown.c
@@ -46,7 +46,6 @@
#include "feature/relay/ext_orport.h"
#include "feature/relay/relay_config.h"
#include "feature/rend/rendcache.h"
-#include "feature/rend/rendclient.h"
#include "feature/stats/bwhist.h"
#include "feature/stats/geoip_stats.h"
#include "feature/stats/rephist.h"
@@ -120,7 +119,6 @@ tor_free_all(int postfork)
addressmap_free_all();
dirserv_free_all();
rend_cache_free_all();
- rend_service_authorization_free_all();
rep_hist_free_all();
bwhist_free_all();
circuit_free_all();