Merge remote-tracking branch 'dgoulet/bug19899_030_01'

3 files changed, 0 insertions, 31 deletions

diff --git a/src/or/directory.c b/src/or/directory.c
index 80f53c28f4..c42cc95f08 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3528,13 +3528,6 @@ handle_get_hs_descriptor_v3(dir_connection_t *conn,
   const char *pubkey_str = NULL;
   const char *url = args->url;
 
-  /* Don't serve v3 descriptors if next gen onion service is disabled. */
-  if (!hs_v3_protocol_is_enabled()) {
-    /* 404 is used for an unrecognized URL so send back the same. */
-    write_http_status_line(conn, 404, "Not found");
-    goto done;
-  }
-
   /* Reject unencrypted dir connections */
   if (!connection_dir_is_encrypted(conn)) {
     write_http_status_line(conn, 404, "Not found");
@@ -3749,13 +3742,6 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers,
    * the prop224 be deployed and thus use. */
   if (connection_dir_is_encrypted(conn) && !strcmpstart(url, "/tor/hs/")) {
     const char *msg = "HS descriptor stored successfully.";
-    /* Don't accept v3 and onward publish request if next gen onion service is
-     * disabled. */
-    if (!hs_v3_protocol_is_enabled()) {
-      /* 404 is used for an unrecognized URL so send back the same. */
-      write_http_status_line(conn, 404, "Not found");
-      goto done;
-    }
 
     /* We most probably have a publish request for an HS descriptor. */
     int code = handle_post_hs_descriptor(url, body);
diff --git a/src/or/hs_common.c b/src/or/hs_common.c
index 7dd97e7c7c..6a88f411be 100644
--- a/src/or/hs_common.c
+++ b/src/or/hs_common.c
@@ -267,18 +267,3 @@ rend_data_get_pk_digest(const rend_data_t *rend_data, size_t *len_out)
     tor_assert(0);
   }
 }
-
-/* Return true iff the Onion Services protocol version 3 is enabled. This only
- * considers the consensus parameter. If the parameter is not found, the
- * default is that it's enabled. */
-int
-hs_v3_protocol_is_enabled(void)
-{
-  /* This consensus param controls if the the onion services version 3 is
-   * enabled or not which is the first version of the next generation
-   * (proposal 224). If this option is set to 0, the tor daemon won't support
-   * the protocol as either a relay, directory, service or client. By default,
-   * it's enabled if the parameter is not found. */
-  return networkstatus_get_param(NULL, "EnableOnionServicesV3", 1, 0, 1);
-}
-
diff --git a/src/or/hs_common.h b/src/or/hs_common.h
index 8158d278df..e0ab510ea4 100644
--- a/src/or/hs_common.h
+++ b/src/or/hs_common.h
@@ -39,7 +39,5 @@ const char *rend_data_get_desc_id(const rend_data_t *rend_data,
 const uint8_t *rend_data_get_pk_digest(const rend_data_t *rend_data,
                                        size_t *len_out);
 
-int hs_v3_protocol_is_enabled(void);
-
 #endif /* TOR_HS_COMMON_H */