summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-09 21:10:17 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-09 21:10:17 -0400
commit84af12e9dbbfb166ee37fd75691e9e7f96dbad5d (patch)
tree04084e2bbebda8570926da58d0550587fd579adc /src
parent6678dff38611bbbc35560ac47ce6b54a108fb6d0 (diff)
parentbe0e1e9e2f69476da0b3e81abc3bbebed0838ad7 (diff)
downloadtor-84af12e9dbbfb166ee37fd75691e9e7f96dbad5d.tar.gz
tor-84af12e9dbbfb166ee37fd75691e9e7f96dbad5d.zip
Merge remote-tracking branch 'arma/feature18998'
Diffstat (limited to 'src')
-rw-r--r--src/or/rendmid.c2
1 files changed, 1 insertions, 1 deletions
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);