diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-05-07 08:02:39 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-05-07 08:02:39 -0400 |
| commit | b72f5da03d12e0ac2212d18e3dea309d23ded79c (patch) | |
| tree | 82789d2222286e6b5500cb357448def627171df9 /src/feature/nodelist/routerlist.c | |
| parent | c8c64caf371c2960bf217fc10d2353144e7e24b3 (diff) | |
| parent | 295feeb09377c4d78f9ee43ec3197b908d7cb960 (diff) | |
| download | tor-b72f5da03d12e0ac2212d18e3dea309d23ded79c.tar.gz tor-b72f5da03d12e0ac2212d18e3dea309d23ded79c.zip | |
Merge branch 'tor-github/pr/994'
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/feature/nodelist/routerlist.c')
| -rw-r--r-- | src/feature/nodelist/routerlist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index 88a5eeac6a..5788347a0e 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -2973,7 +2973,7 @@ routerinfo_incompatible_with_extrainfo(const crypto_pk_t *identity_pkey, digest256_matches = tor_memeq(ei->digest256, sd->extra_info_digest256, DIGEST256_LEN); digest256_matches |= - tor_mem_is_zero(sd->extra_info_digest256, DIGEST256_LEN); + fast_mem_is_zero(sd->extra_info_digest256, DIGEST256_LEN); /* The identity must match exactly to have been generated at the same time * by the same router. */ @@ -3057,7 +3057,7 @@ routerinfo_has_curve25519_onion_key(const routerinfo_t *ri) return 0; } - if (tor_mem_is_zero((const char*)ri->onion_curve25519_pkey->public_key, + if (fast_mem_is_zero((const char*)ri->onion_curve25519_pkey->public_key, CURVE25519_PUBKEY_LEN)) { return 0; } |