commit 6e99286d45be482effe47feb057948b98495a49f Author: David Goulet dgoulet@torproject.org Date: Thu May 10 09:16:50 2018 -0400

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

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 --- changes/bug26069 | 5 +++++ src/or/hs_descriptor.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug26069 b/changes/bug26069 new file mode 100644 index 000000000..192e97d78 --- /dev/null +++ b/changes/bug26069 @@ -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. diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index fae527b2d..3ec02618b 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -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) {