diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-12 19:25:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-12 19:25:14 -0400 |
| commit | 59a6df8882cbb404a5d22d99ce99684348aea8c8 (patch) | |
| tree | b7be88ea50c4a71201ae940dec2dbd490faf0b78 /src/or/directory.c | |
| parent | 379de3d10acd45f02aa6c64f54de9b7faa634df5 (diff) | |
| parent | 8fb38331c3213caef2d2e003e02cdb361504f14f (diff) | |
| download | tor-59a6df8882cbb404a5d22d99ce99684348aea8c8.tar.gz tor-59a6df8882cbb404a5d22d99ce99684348aea8c8.zip | |
Merge remote-tracking branch 'public/bug3122_memcmp_022' into maint-0.2.2
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 8c6581a123..4c26671c70 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2442,7 +2442,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; }; @@ -3615,17 +3615,17 @@ dir_routerdesc_download_failed(smartlist_t *failed, int status_code, * every 10 or 60 seconds (FOO_DESCRIPTOR_RETRY_INTERVAL) in main.c. */ } -/** 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 |