mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.3.2' into maint-0.3.3

Browse source
This commit is contained in:
Nick Mathewson 2018-05-10 09:22:32 -04:00
commit b343ba9060
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

@ -1895,7 +1895,7 @@ desc_sig_is_valid(const char *b64_sig,
} }
/* Find the start of signature. */ /* 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 /* 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. */ * can't find the start of the signature, we have a code flow issue. */
if (!sig_start) { if (!sig_start) {