Commit db7b2a33 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Automated conversion of memcmp to tor_memcmp/tor_mem[n]eq 

This commit is _exactly_ the result of

perl -i -pe 's/\bmemcmp\(/tor_memcmp\(/g' src/*/*.[ch]
perl -i -pe 's/\!\s*tor_memcmp\(/tor_memeq\(/g' src/*/*.[ch]
perl -i -pe 's/0\s*==\s*tor_memcmp\(/tor_memeq\(/g' src/*/*.[ch]
perl -i -pe 's/0\s*!=\s*tor_memcmp\(/tor_memneq\(/g' src/*/*.[ch]
git checkout src/common/di_ops.[ch]
git checkout src/or/test.c
git checkout src/common/test.h
parent 1d703ed2

src/common/address.c

+1 −1
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2, 
        const uint8_t *a2 = tor_addr_to_in6_addr8(addr2);

        const int bytes = mbits >> 3;

        const int leftover_bits = mbits & 7;

        if (bytes && (r = memcmp(a1, a2, bytes))) {

        if (bytes && (r = tor_memcmp(a1, a2, bytes))) {

          return r;

        } else if (leftover_bits) {

          uint8_t b1 = a1[bytes] >> (8-leftover_bits);

src/common/compat.c

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ tor_memmem(const void *_haystack, size_t hlen, 
  while ((p = memchr(p, first, end-p))) {

    if (p+nlen > end)

      return NULL;

    if (!memcmp(p, needle, nlen))

    if (tor_memeq(p, needle, nlen))

      return p;

    ++p;

  }

src/common/container.c

+4 −4
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ smartlist_string_num_isin(const smartlist_t *sl, int num) 
}



/** Return true iff <b>sl</b> has some element E such that

 * !memcmp(E,<b>element</b>,DIGEST_LEN)

 * tor_memeq(E,<b>element</b>,DIGEST_LEN)

 */

int

smartlist_digest_isin(const smartlist_t *sl, const char *element)
@@ -223,7 +223,7 @@ smartlist_digest_isin(const smartlist_t *sl, const char *element) 
  int i;

  if (!sl) return 0;

  for (i=0; i < sl->num_used; i++)

    if (memcmp((const char*)sl->list[i],element,DIGEST_LEN)==0)

    if (tor_memcmp((const char*)sl->list[i],element,DIGEST_LEN)==0)

      return 1;

  return 0;

}
@@ -663,7 +663,7 @@ smartlist_pqueue_assert_ok(smartlist_t *sl, 
static int

_compare_digests(const void **_a, const void **_b)

{

  return memcmp((const char*)*_a, (const char*)*_b, DIGEST_LEN);

  return tor_memcmp((const char*)*_a, (const char*)*_b, DIGEST_LEN);

}



/** Sort the list of DIGEST_LEN-byte digests into ascending order. */
@@ -716,7 +716,7 @@ strmap_entry_hash(const strmap_entry_t *a) 
static INLINE int

digestmap_entries_eq(const digestmap_entry_t *a, const digestmap_entry_t *b)

{

  return !memcmp(a->key, b->key, DIGEST_LEN);

  return tor_memeq(a->key, b->key, DIGEST_LEN);

}



/** Helper: return a hash value for a digest_map_t. */

src/common/container.h

+2 −2
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, 
 * Example use:

 *  SMARTLIST_FOREACH_JOIN(routerstatus_list, routerstatus_t *, rs,

 *                     routerinfo_list, routerinfo_t *, ri,

 *                     memcmp(rs->identity_digest, ri->identity_digest, 20),

 *                     tor_memcmp(rs->identity_digest, ri->identity_digest, 20),

 *                     log_info(LD_GENERAL,"No match for %s", ri->nickname)) {

 *    log_info(LD_GENERAL, "%s matches routerstatus %p", ri->nickname, rs);

 * } SMARTLIST_FOREACH_JOIN_END(rs, ri);
@@ -256,7 +256,7 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, 
 *    ri = smartlist_get(routerinfo_list, ri_sl_idx);

 *    while (rs_sl_idx < rs_sl_len) {

 *      rs = smartlist_get(routerstatus_list, rs_sl_idx);

 *      rs_ri_cmp = memcmp(rs->identity_digest, ri->identity_digest, 20);

 *      rs_ri_cmp = tor_memcmp(rs->identity_digest, ri->identity_digest, 20);

 *      if (rs_ri_cmp > 0) {

 *        break;

 *      } else if (rs_ri_cmp == 0) {

src/common/crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ crypto_pk_public_checksig_digest(crypto_pk_env_t *env, const char *data, 
    tor_free(buf);

    return -1;

  }

  if (memcmp(buf, digest, DIGEST_LEN)) {

  if (tor_memcmp(buf, digest, DIGEST_LEN)) {

    log_warn(LD_CRYPTO, "Signature mismatched with digest.");

    tor_free(buf);

    return -1;