[tor-commits] [tor/maint-0.4.6] hs-v2: Disable SOCKS connection for v2 addresses

[dgoulet at torproject.org]

commit 13b2b1108f2640e68dc7af95f5c7278984de743c
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Sep 30 10:26:37 2021 -0400

    hs-v2: Disable SOCKS connection for v2 addresses
    
    This effectively turns off the ability of tor to use HSv2 as a client by
    invalidating the v2 onion hostname passed through a SOCKS request.
    
    Part of #40476
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/core/or/connection_edge.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c
index 84b80313ce..ae9177a2d0 100644
--- a/src/core/or/connection_edge.c
+++ b/src/core/or/connection_edge.c
@@ -4348,9 +4348,6 @@ parse_extended_hostname(char *address)
     if (q != address) {
       memmove(address, q, strlen(q) + 1 /* also get \0 */);
     }
-    if (rend_valid_v2_service_id(query)) {
-      return ONION_V2_HOSTNAME; /* success */
-    }
     if (hs_address_is_valid(query)) {
       return ONION_V3_HOSTNAME;
     }