aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/feature189985
-rw-r--r--src/or/rendmid.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/feature18998 b/changes/feature18998
new file mode 100644
index 0000000000..a2679c016c
--- /dev/null
+++ b/changes/feature18998
@@ -0,0 +1,5 @@
+ o Minor features:
+ - Stop being so strict about the payload length of "rendezvous1"
+ cells. We used to be locked in to the "tap" handshake length,
+ and now we can handle better handshakes like "ntor". Resolves
+ ticket 18998.
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index a33ad92966..ca0ad7b0d4 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -309,7 +309,7 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request,
goto err;
}
- if (request_len != REND_COOKIE_LEN+DH_KEY_LEN+DIGEST_LEN) {
+ if (request_len < REND_COOKIE_LEN) {
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
"Rejecting RENDEZVOUS1 cell with bad length (%d) on circuit %u.",
(int)request_len, (unsigned)circ->p_circ_id);