diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-12 19:27:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-12 19:27:18 -0400 |
| commit | af85017177566a26d17076a256b3a4d5ae555170 (patch) | |
| tree | e10d62291caa738067a23cfe2b43af4192575a13 /src/or/directory.c | |
| parent | 696cd1cfe25e064ed3ceacf5ea5c7b18264873c6 (diff) | |
| parent | 9e16a418f92670ae713138701fa931567fb4983d (diff) | |
| download | tor-af85017177566a26d17076a256b3a4d5ae555170.tar.gz tor-af85017177566a26d17076a256b3a4d5ae555170.zip | |
Merge remote-tracking branch 'public/bug3122_memcmp_023'
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 2821619ce7..c0378a419f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2547,7 +2547,7 @@ client_likes_consensus(networkstatus_t *v, const char *want_url) SMARTLIST_FOREACH_BEGIN(v->voters, networkstatus_voter_info_t *, vi) { if (smartlist_len(vi->sigs) && - !memcmp(vi->identity_digest, want_digest, want_len)) { + tor_memeq(vi->identity_digest, want_digest, want_len)) { have++; break; }; @@ -3750,17 +3750,17 @@ dir_microdesc_download_failed(smartlist_t *failed, } SMARTLIST_FOREACH_END(d); } -/** Helper. Compare two fp_pair_t objects, and return -1, 0, or 1 as - * appropriate. */ +/** Helper. Compare two fp_pair_t objects, and return negative, 0, or + * positive as appropriate. */ static int _compare_pairs(const void **a, const void **b) { const fp_pair_t *fp1 = *a, *fp2 = *b; int r; - if ((r = memcmp(fp1->first, fp2->first, DIGEST_LEN))) + if ((r = fast_memcmp(fp1->first, fp2->first, DIGEST_LEN))) return r; else - return memcmp(fp1->second, fp2->second, DIGEST_LEN); + return fast_memcmp(fp1->second, fp2->second, DIGEST_LEN); } /** Divide a string <b>res</b> of the form FP1-FP2+FP3-FP4...[.z], where each |