Commit 987c7cae authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.2.8' into maint-0.2.9

parents d561da10 d15d09a9
Loading
Loading
Loading
Loading

changes/trove-2017-005

0 → 100644
+7 −0
Original line number Diff line number Diff line
  o Major bugfixes (hidden service, relay, security):
    - Fix an assertion failure caused by receiving a BEGIN_DIR cell on
      a hidden service rendezvous circuit. Fixes bug 22494, tracked as
      TROVE-2017-005 and CVE-2017-0376; bugfix on 0.2.2.1-alpha. Found
      by armadev.

+2 −1
Original line number Diff line number Diff line
@@ -1499,7 +1499,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
               "Begin cell for known stream. Dropping.");
        return 0;
      }
      if (rh.command == RELAY_COMMAND_BEGIN_DIR) {
      if (rh.command == RELAY_COMMAND_BEGIN_DIR &&
          circ->purpose != CIRCUIT_PURPOSE_S_REND_JOINED) {
        /* Assign this circuit and its app-ward OR connection a unique ID,
         * so that we can measure download times. The local edge and dir
         * connection will be assigned the same ID when they are created