diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-10 09:22:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-10 09:22:32 -0400 |
| commit | b343ba90604de524b5fa7d87a6daf76fcc118adb (patch) | |
| tree | fd359e03564ed5ced2837be8d23fd5dab69b6b54 | |
| parent | f64fa6b19ec7663f47e600599761fadbde4135e9 (diff) | |
| parent | 7ee67c47fae2263e8c4f5599e0fbba6531738120 (diff) | |
| download | tor-b343ba90604de524b5fa7d87a6daf76fcc118adb.tar.gz tor-b343ba90604de524b5fa7d87a6daf76fcc118adb.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
| -rw-r--r-- | changes/bug26069 | 5 | ||||
| -rw-r--r-- | src/or/hs_descriptor.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug26069 b/changes/bug26069 new file mode 100644 index 0000000000..192e97d782 --- /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 7388807bc5..52a58d926d 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -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) { |