nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.3' into release-0.4.3

Browse Source
This commit is contained in:
Nick Mathewson 2020-10-07 08:35:18 -04:00
commit df3e5e1cb0
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug34400 Normal file
View File

@ -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.

2
src/feature/control/control_cmd.c
View File

@ -1430,7 +1430,7 @@ handle_control_hsfetch(control_connection_t *conn,
rend_valid_descriptor_id(arg1 + v2_str_len) && rend_valid_descriptor_id(arg1 + v2_str_len) &&
base32_decode(digest, sizeof(digest), 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) ==
REND_DESC_ID_V2_LEN_BASE32) { sizeof(digest)) {
/* We have a well formed version 2 descriptor ID. Keep the decoded value /* We have a well formed version 2 descriptor ID. Keep the decoded value
* of the id. */ * of the id. */
desc_id = digest; desc_id = digest;