diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-09 21:10:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-09 21:10:17 -0400 |
| commit | 84af12e9dbbfb166ee37fd75691e9e7f96dbad5d (patch) | |
| tree | 04084e2bbebda8570926da58d0550587fd579adc | |
| parent | 6678dff38611bbbc35560ac47ce6b54a108fb6d0 (diff) | |
| parent | be0e1e9e2f69476da0b3e81abc3bbebed0838ad7 (diff) | |
| download | tor-84af12e9dbbfb166ee37fd75691e9e7f96dbad5d.tar.gz tor-84af12e9dbbfb166ee37fd75691e9e7f96dbad5d.zip | |
Merge remote-tracking branch 'arma/feature18998'
| -rw-r--r-- | changes/feature18998 | 5 | ||||
| -rw-r--r-- | src/or/rendmid.c | 2 |
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); |