tor

commit 0e2e517019bf3c8779c9a3f81e453277a372c9f3
parent faac18607521380ff330a6e0b207e7b1d3d35384
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed,  7 Oct 2020 08:35:18 -0400

Merge branch 'maint-0.4.3' into maint-0.4.4

Diffstat:
A
changes/bug34400
 | 
5
+++++
M
src/feature/control/control_cmd.c
 | 
2
+-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug34400 b/changes/bug34400
@@ -0,0 +1,5 @@
+  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.
diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c
@@ -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;