Commit 0e2e5170 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.4.3' into maint-0.4.4

parents faac1860 884cad3e

changes/bug34400

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (v2 onion services):

    - For HSFETCH commands on v2 onion services addresses, check the length of

      bytes decoded, not the base32 length. This takes the behavior introduced

      in commit a517daa56f5848d25ba79617a1a7b82ed2b0a7c0 into consideration.

      Fixes bug 34400; bugfix on 0.4.1.1-alpha. Patch by Neel Chauhan.

src/feature/control/control_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -1430,7 +1430,7 @@ handle_control_hsfetch(control_connection_t *conn, 
             rend_valid_descriptor_id(arg1 + v2_str_len) &&

             base32_decode(digest, sizeof(digest), arg1 + v2_str_len,

                           REND_DESC_ID_V2_LEN_BASE32) ==

                REND_DESC_ID_V2_LEN_BASE32) {

                sizeof(digest)) {

    /* We have a well formed version 2 descriptor ID. Keep the decoded value

     * of the id. */

    desc_id = digest;