diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-10-07 08:35:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-10-07 08:35:18 -0400 |
| commit | 0e2e517019bf3c8779c9a3f81e453277a372c9f3 (patch) | |
| tree | 9dd7896d6ba3be07ada9ae0ddc8b6c1a810c0443 | |
| parent | faac18607521380ff330a6e0b207e7b1d3d35384 (diff) | |
| parent | 884cad3edffb644a3da8b1e7e704678225cfe4ac (diff) | |
| download | tor-0e2e517019bf3c8779c9a3f81e453277a372c9f3.tar.gz tor-0e2e517019bf3c8779c9a3f81e453277a372c9f3.zip | |
Merge branch 'maint-0.4.3' into maint-0.4.4
| -rw-r--r-- | changes/bug34400 | 5 | ||||
| -rw-r--r-- | src/feature/control/control_cmd.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug34400 b/changes/bug34400 new file mode 100644 index 0000000000..e2b56688b9 --- /dev/null +++ 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 index d9a38011de..eb14f101e7 100644 --- 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; |