[tor-commits] [tor/master] Fix handling of ntor handshakes received via CREATE cells

[nickm at torproject.org]

commit beca92c31bed468be2db52c649f7276486e4018e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 15 00:41:09 2013 -0500

    Fix handling of ntor handshakes received via CREATE cells
    
    Fixes bug 7959; bugfix on 0.2.4.8-alpha.
---
 changes/bug7959 |    6 ++++++
 src/or/onion.c  |    3 ++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/changes/bug7959 b/changes/bug7959
new file mode 100644
index 0000000..80cd866
--- /dev/null
+++ b/changes/bug7959
@@ -0,0 +1,6 @@
+  o Major bugfixes:
+    - Fix backward compatibility logic when receiving an embedded ntor
+      handshake tunneled in a CREATE cell. This clears up the "Bug: couldn't
+      format CREATED cell" warning. Fix for bug 7959; bugfix on
+      0.2.4.8-alpha.
+
diff --git a/src/or/onion.c b/src/or/onion.c
index fc3e621..329b01c 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: