diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-02-27 15:34:02 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-02-27 15:34:02 -0500 |
| commit | 937b5cdd41b03a6e05af4003a444172e3e88a31d (patch) | |
| tree | 45e64a43d551816d0d7a5a443a19ada1f90dc2a4 /src/or/router.c | |
| parent | 1c39dbd53a4c47ac3bfd6770d0ca2f8f058f888b (diff) | |
| parent | b67657bd952919d0b738a1ffd6c48cc369604873 (diff) | |
| download | tor-937b5cdd41b03a6e05af4003a444172e3e88a31d.tar.gz tor-937b5cdd41b03a6e05af4003a444172e3e88a31d.zip | |
Merge remote branch 'origin/maint-0.2.1'
Conflicts:
ChangeLog
src/or/routerparse.c
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/router.c b/src/or/router.c index 257bca935b..2c7e4dc5d0 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1416,6 +1416,7 @@ router_rebuild_descriptor(int force) ei->cache_info.send_unencrypted = 1; router_get_router_hash(ri->cache_info.signed_descriptor_body, + strlen(ri->cache_info.signed_descriptor_body), ri->cache_info.signed_descriptor_digest); routerinfo_set_country(ri); @@ -1778,7 +1779,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, strlcpy(s+written, "router-signature\n", maxlen-written); written += strlen(s+written); s[written] = '\0'; - if (router_get_router_hash(s, digest) < 0) { + if (router_get_router_hash(s, strlen(s), digest) < 0) { return -1; } |