aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2022-01-19 13:56:43 -0500
committerDavid Goulet <dgoulet@torproject.org>2022-01-19 13:56:43 -0500
commit0f9967c9454bee18c5975b13c3e9bb5889e72e9d (patch)
tree210751138cee20ed93cf3274b5440ab0c5b998a7
parent4d60ab8fb798c35de2a646bfa7c71a88835b9c11 (diff)
parent986730e82c69d4a29e3b00cde5a7bf7a15a3b94b (diff)
downloadtor-0f9967c9454bee18c5975b13c3e9bb5889e72e9d.tar.gz
tor-0f9967c9454bee18c5975b13c3e9bb5889e72e9d.zip
Merge branch 'maint-0.4.5' into maint-0.4.6
-rw-r--r--src/test/test_protover.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/test/test_protover.c b/src/test/test_protover.c
index 6ebc84b5a4..e45f0d58d2 100644
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@ -348,9 +348,6 @@ test_protover_supports_version(void *arg)
/* Deprecated HSIntro versions */
#define PROTOVER_HS_INTRO_DEPRECATED_1 1
#define PROTOVER_HS_INTRO_DEPRECATED_2 2
-/* Highest supported HSv2 introduce protocol version.
- * It's not clear if we actually support version 2, see #25068. */
-#define PROTOVER_HS_INTRO_V2 3
/* HSv2 Rend and HSDir protocol versions. */
#define PROTOVER_HS_RENDEZVOUS_POINT_V2 1
@@ -433,12 +430,6 @@ test_protover_supported_protocols(void *arg)
tt_assert(!protocol_list_supports_protocol(supported_protocols,
PRT_HSINTRO,
PROTOVER_HS_INTRO_DEPRECATED_2));
- /* We could test legacy HSIntro by calling rend_service_update_descriptor(),
- * and checking the protocols field. But that's unlikely to change, so
- * we just use a hard-coded value. */
- tt_assert(protocol_list_supports_protocol(supported_protocols,
- PRT_HSINTRO,
- PROTOVER_HS_INTRO_V2));
/* Test for HSv3 HSIntro */
tt_assert(protocol_list_supports_protocol(supported_protocols,
PRT_HSINTRO,