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

hs-v3: Add an extra white-space when parsing descriptor

Browse Source 
The specification describes the signature token to be right after a newline
(\n) then the token "signature" and then a white-space followed by the encoded
signature.

This commit makes sure that when we parse the signature from the descriptor,
we are always looking for that extra white-space at the end of the token.

It will allow us also to support future fields that might start with
"signature".

Fixes #26069

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2018-05-10 09:16:50 -04:00
parent aa08c19703
commit 6e99286d45
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/bug26069 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (hidden service v3):
- When parsing the descriptor signature, look for the token plus an extra
white-space at the end. This is more correct but also will allow us to
support new fields that might start with "signature". Fixes bug 26069;
bugfix on 0.3.0.1-alpha.

2
src/or/hs_descriptor.c
View File

@ -1849,7 +1849,7 @@ desc_sig_is_valid(const char *b64_sig,
}
/* Find the start of signature. */
sig_start = tor_memstr(encoded_desc, encoded_len, "\n" str_signature);
sig_start = tor_memstr(encoded_desc, encoded_len, "\n" str_signature " ");
/* Getting here means the token parsing worked for the signature so if we
* can't find the start of the signature, we have a code flow issue. */
if (!sig_start) {