[or-cvs] r10405: Backport r10305; probably harmless; Set signed_descriptor_di (in tor/branches/tor-0_1_2-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-05-30 00:53:24 -0400 (Wed, 30 May 2007)
New Revision: 10405

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/src/or/router.c
Log:
 r13081 at catbus:  nickm | 2007-05-30 00:45:34 -0400
 Backport r10305; probably harmless; Set signed_descriptor_digest field in own descriptor correctly.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r13081] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/src/or/router.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/router.c	2007-05-30 02:57:57 UTC (rev 10404)
+++ tor/branches/tor-0_1_2-patches/src/or/router.c	2007-05-30 04:53:24 UTC (rev 10405)
@@ -949,10 +949,10 @@
   }
   ri->cache_info.signed_descriptor_len =
     strlen(ri->cache_info.signed_descriptor_body);
-  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);
+
   if (desc_routerinfo)
     routerinfo_free(desc_routerinfo);
   desc_routerinfo = ri;