Merge branch 'maint-0.3.1' into maint-0.3.2

This commit is contained in:
Nick Mathewson 2018-05-10 09:22:32 -04:00
commit 7ee67c47fa
2 changed files with 6 additions and 1 deletions

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.

View File

@ -1895,7 +1895,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) {