Backport: fix bug 880: find the end of an authority cert by looking for the first ----END SIGNATURE----- after the first dir-key-certification, not for the first ----END SIGNATURE. Harmless bug, but it made us non-spec-compliant.

svn:r17471

1 files changed, 6 insertions, 1 deletions

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 1520dc32fa..7675ef5a83 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1483,7 +1483,12 @@ authority_cert_parse_from_string(const char *s, const char **end_of_string)
   int found;
 
   s = eat_whitespace(s);
-  eos = strstr(s, "\n-----END SIGNATURE-----\n");
+  eos = strstr(s, "\ndir-key-certification");
+  if (! eos) {
+    log_warn(LD_DIR, "No signature found on key certificate");
+    return NULL;
+  }
+  eos = strstr(eos, "\n-----END SIGNATURE-----\n");
   if (! eos) {
     log_warn(LD_DIR, "No end-of-signature found on key certificate");
     return NULL;