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/routerparse.c | |
| parent | 9964c314c6c6af4b921875c973f28f8d01b2e9a2 (diff) | |
| download | tor-0cbcbc3412b667537b6ec54da0a4c9173a19d6de.tar tor-0cbcbc3412b667537b6ec54da0a4c9173a19d6de.tar.gz | |
Re-apply the automated conversion to 0.2.2 to make handle any memcmps that snuck in
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 3b669ad45..12d1dfe52 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3499,8 +3499,8 @@ networkstatus_parse_detached_signatures(const char *s, const char *eos) is_duplicate = 0; SMARTLIST_FOREACH(siglist, document_signature_t *, s, { if (s->alg == alg && - !memcmp(id_digest, s->identity_digest, DIGEST_LEN) && - !memcmp(sk_digest, s->signing_key_digest, DIGEST_LEN)) { + tor_memeq(id_digest, s->identity_digest, DIGEST_LEN) && + tor_memeq(sk_digest, s->signing_key_digest, DIGEST_LEN)) { is_duplicate = 1; } }); @@ -4538,7 +4538,7 @@ tor_version_compare(tor_version_t *a, tor_version_t *b) else if ((i = a->git_tag_len - b->git_tag_len)) return i; else if (a->git_tag_len) - return memcmp(a->git_tag, b->git_tag, a->git_tag_len); + return tor_memcmp(a->git_tag, b->git_tag, a->git_tag_len); else return 0; } |