aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-09-30 10:40:19 -0400
committerDavid Goulet <dgoulet@torproject.org>2021-09-30 10:40:19 -0400
commitff3ac02702df8b32ef4c1ddb60816ac30400a617 (patch)
tree71b9b19f82b60e4785d31254404585412c502d1a
parent765bdb9c3331a0fdbf15406db82fa4a29d6651b4 (diff)
downloadtor-ff3ac02702df8b32ef4c1ddb60816ac30400a617.tar.gz
tor-ff3ac02702df8b32ef4c1ddb60816ac30400a617.zip
hs-v2: Disable version 2 introduction point
Upon receiving a v2 introduction request, the relay will close the circuit and send back a tor protocol error. Part of #40476 Signed-off-by: David Goulet <dgoulet@torproject.org>
-rw-r--r--src/feature/hs/hs_intropoint.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/feature/hs/hs_intropoint.c b/src/feature/hs/hs_intropoint.c
index 7717ed53d4..9c886228c5 100644
--- a/src/feature/hs/hs_intropoint.c
+++ b/src/feature/hs/hs_intropoint.c
@@ -320,7 +320,8 @@ hs_intro_received_establish_intro(or_circuit_t *circ, const uint8_t *request,
switch (first_byte) {
case TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_LEGACY0:
case TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_LEGACY1:
- return rend_mid_establish_intro_legacy(circ, request, request_len);
+ /* Don't accept version 2 introduction anymore. */
+ goto err;
case TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_ED25519:
return handle_establish_intro(circ, request, request_len);
default: