Hand-tune the new tor_memcmp instances in 0.2.2

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 1fd0cd26c2ad7bcf78d24f8bb83f2fea9ea97058..eadc2d7430fec0ed87af7a14d710820a793a2408 100644 (file)
--- 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 (tor_memcmp(desc->cache_info.signed_descriptor_digest,
+      if (tor_memneq(desc->cache_info.signed_descriptor_digest,
             rs->descriptor_digest,
             DIGEST_LEN)) {
         char rl_d[HEX_DIGEST_LEN+1];

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index a017cfbb37245af10b534fb71f8b3aa649f6d2dc..dd156bd9d93ef0a76ac8cd0e268b4750f45e82bb 100644 (file)
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2211,7 +2211,7 @@ networkstatus_add_detached_signatures(networkstatus_t *target,
     }
     for (alg = DIGEST_SHA1; alg < N_DIGEST_ALGORITHMS; ++alg) {
       if (!tor_mem_is_zero(digests->d[alg], DIGEST256_LEN)) {
-        if (tor_memeq(target->digests.d[alg], digests->d[alg], DIGEST256_LEN)) {
+        if (fast_memeq(target->digests.d[alg], digests->d[alg], DIGEST256_LEN)) {
           ++n_matches;
         } else {
           *msg_out = "Mismatched digest.";
@@ -3615,7 +3615,7 @@ vote_routerstatus_find_microdesc_hash(char *digest256_out,
      * the first part. */
     while (1) {
       num_len = strspn(cp, "1234567890");
-      if (num_len == mlen && tor_memeq(mstr, cp, mlen)) {
+      if (num_len == mlen && fast_memeq(mstr, cp, mlen)) {
         /* This is the line. */
         char buf[BASE64_DIGEST256_LEN+1];
         /* XXXX ignores extraneous stuff if the digest is too long.  This

diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index 33238b2e05c56d689ef28fa0fc53c54a19cd519e..fc005df2d70f5e857ee1dcf75815a665c71c29cc 100644 (file)
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -2253,7 +2253,7 @@ sockaddr_is_loopback(const struct sockaddr *addr)
                return (ntohl(sin->sin_addr.s_addr) & 0xff000000) == 0x7f000000;
        } else if (addr->sa_family == AF_INET6) {
                struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)addr;
-               return tor_memeq(sin6->sin6_addr.s6_addr, LOOPBACK_S6, 16);
+               return fast_memeq(sin6->sin6_addr.s6_addr, LOOPBACK_S6, 16);
        }
        return 0;
 }

diff --git a/src/or/microdesc.c b/src/or/microdesc.c
index 139f2f8b5eb7807a7e899be1eacf131b62d85f5e..b87e0d9dcb61995797ea1b17fa3d94741556fa88 100644 (file)
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@ -414,7 +414,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force)
   SMARTLIST_FOREACH_BEGIN(wrote, microdesc_t *, md) {
     tor_assert(md->saved_location == SAVED_IN_CACHE);
     md->body = (char*)cache->cache_content->data + md->off;
-    tor_assert(tor_memeq(md->body, "onion-key", 9));
+    tor_assert(fast_memeq(md->body, "onion-key", 9));
   } SMARTLIST_FOREACH_END(md);
 
   smartlist_free(wrote);

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index c54025b8b01dcecba1e1ce8e67e4d8a8eb477c8c..6c649ab5266a2802a3233b6d02b7c0aa1352ea16 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3105,7 +3105,7 @@ routerlist_replace(routerlist_t *rl, routerinfo_t *ri_old,
       sdmap_remove(rl->desc_digest_map,
                    ri_old->cache_info.signed_descriptor_digest);
 
-      if (tor_memcmp(ri_old->cache_info.extra_info_digest,
+      if (tor_memneq(ri_old->cache_info.extra_info_digest,
                  ri_new->cache_info.extra_info_digest, DIGEST_LEN)) {
         ei_tmp = eimap_remove(rl->extra_info_map,
                               ri_old->cache_info.extra_info_digest);

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 12d1dfe52eaad3e2fb9d40e8a3788b0301170838..389f22fd99a3946a49878bd9bef73699098f9a16 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -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 tor_memcmp(a->git_tag, b->git_tag, a->git_tag_len);
+    return fast_memcmp(a->git_tag, b->git_tag, a->git_tag_len);
   else
     return 0;
 }