diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-11 16:27:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-11 16:27:27 -0400 |
| commit | 0cbcbc3412b667537b6ec54da0a4c9173a19d6de (patch) | |
| tree | 6cf0e59b26854a49be2326d49f57189a48e31b60 /src/or/dirserv.c | |
| parent | 9964c314c6c6af4b921875c973f28f8d01b2e9a2 (diff) | |
| download | tor-0cbcbc3412b667537b6ec54da0a4c9173a19d6de.tar.gz tor-0cbcbc3412b667537b6ec54da0a4c9173a19d6de.zip | |
Re-apply the automated conversion to 0.2.2 to make handle any memcmps that snuck in
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 1f4489a7e0..1fd0cd26c2 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2087,7 +2087,7 @@ routerstatus_format_entry(char *buf, size_t buf_len, /* This assert can fire for the control port, because * it can request NS documents before all descriptors * have been fetched. */ - if (memcmp(desc->cache_info.signed_descriptor_digest, + if (tor_memcmp(desc->cache_info.signed_descriptor_digest, rs->descriptor_digest, DIGEST_LEN)) { char rl_d[HEX_DIGEST_LEN+1]; @@ -2103,7 +2103,7 @@ routerstatus_format_entry(char *buf, size_t buf_len, "(router %s)\n", rl_d, rs_d, id); - tor_assert(!memcmp(desc->cache_info.signed_descriptor_digest, + tor_assert(tor_memeq(desc->cache_info.signed_descriptor_digest, rs->descriptor_digest, DIGEST_LEN)); }; |