aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-01-15 00:41:09 -0500
committerNick Mathewson <nickm@torproject.org>2013-01-15 00:41:09 -0500
commitbeca92c31bed468be2db52c649f7276486e4018e (patch)
treebcb70e4f47c0de0c3bdbe1e99b935bb3396f10b9 /src/or
parentebf30613ea41bbed3340851e839da9b7db4351c5 (diff)
downloadtor-beca92c31bed468be2db52c649f7276486e4018e.tar
tor-beca92c31bed468be2db52c649f7276486e4018e.tar.gz
Fix handling of ntor handshakes received via CREATE cells
Fixes bug 7959; bugfix on 0.2.4.8-alpha.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/onion.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/onion.c b/src/or/onion.c
index fc3e621f7..329b01c20 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -560,7 +560,8 @@ check_created_cell(const created_cell_t *cell)
{
switch (cell->cell_type) {
case CELL_CREATED:
- if (cell->handshake_len != TAP_ONIONSKIN_REPLY_LEN)
+ if (cell->handshake_len != TAP_ONIONSKIN_REPLY_LEN &&
+ cell->handshake_len != NTOR_REPLY_LEN)
return -1;
break;
case CELL_CREATED_FAST: