[or-cvs] r10305: Put the hash-as-signed, not the raw hash, in the signed_desc (in tor/trunk: . src/or)
nickm at seul.org
nickm at seul.org
Thu May 24 17:13:00 UTC 2007
Author: nickm
Date: 2007-05-24 13:13:00 -0400 (Thu, 24 May 2007)
New Revision: 10305
Modified:
tor/trunk/
tor/trunk/src/or/router.c
Log:
r12917 at catbus: nickm | 2007-05-24 12:48:47 -0400
Put the hash-as-signed, not the raw hash, in the signed_descriptor_digest field of our own descriptor. Backport candidate; probably harmless though.
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r12917] on 8246c3cf-6607-4228-993b-4d95d33730f1
Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c 2007-05-24 17:12:57 UTC (rev 10304)
+++ tor/trunk/src/or/router.c 2007-05-24 17:13:00 UTC (rev 10305)
@@ -1149,11 +1149,10 @@
}
ri->cache_info.signed_descriptor_len =
strlen(ri->cache_info.signed_descriptor_body);
- /* XXXX020 router_get_router_hash??? */
- crypto_digest(ri->cache_info.signed_descriptor_digest,
- ri->cache_info.signed_descriptor_body,
- ri->cache_info.signed_descriptor_len);
+ router_get_router_hash(ri->cache_info.signed_descriptor_body,
+ ri->cache_info.signed_descriptor_digest);
+
tor_assert(! routerinfo_incompatible_with_extrainfo(ri, ei, NULL));
if (desc_routerinfo)
More information about the tor-commits
mailing list